Added the Files tab, fixed peer tab, started adding functionality for the buttons, cleaned up general tab
This commit is contained in:
@@ -1,17 +1,14 @@
|
||||
package storage
|
||||
|
||||
import (
|
||||
binary "encoding/binary"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/boltdb/bolt"
|
||||
"github.com/asdine/storm"
|
||||
)
|
||||
|
||||
//TODO, this entire file need to be rewritten to encode and decode from the struct
|
||||
//TorrentLocal is local storage of the torrents for readd on server restart
|
||||
//TorrentLocal is local storage of the torrents for readd on server restart, marshalled into the database using Storm
|
||||
type TorrentLocal struct {
|
||||
Hash string
|
||||
Hash string `storm:"id,unique"` //Hash should be unique for every torrent... if not we are re-adding an already added torrent \\TODO check for re-add of same torrent
|
||||
DateAdded string
|
||||
StoragePath string
|
||||
TorrentName string
|
||||
@@ -25,204 +22,56 @@ type TorrentLocal struct {
|
||||
}
|
||||
|
||||
//ReadInTorrents is called to read in ALL local stored torrents in the boltdb database (called on server restart)
|
||||
func ReadInTorrents(torrentStorage *bolt.DB) (torrentLocalArray []*TorrentLocal) { //test
|
||||
|
||||
torrentLocalArray = []*TorrentLocal{}
|
||||
|
||||
torrentStorage.View(func(tx *bolt.Tx) error {
|
||||
|
||||
tx.ForEach(func(name []byte, b *bolt.Bucket) error {
|
||||
torrentLocal := new(TorrentLocal) //create a struct to store to an array //TODO clean this the fuck up just read the struct into something that converts them all the byte arrays
|
||||
var Dateadded []byte
|
||||
var StoragePath []byte
|
||||
var Hash []byte
|
||||
var TorrentName []byte
|
||||
var TorrentStatus []byte
|
||||
var TorrentType []byte
|
||||
var TorrentFileName []byte
|
||||
Dateadded = b.Get([]byte("Date"))
|
||||
if Dateadded == nil {
|
||||
fmt.Println("Date added error!")
|
||||
Dateadded = []byte(time.Now().Format("Jan _2 2006"))
|
||||
}
|
||||
StoragePath = b.Get([]byte("StoragePath"))
|
||||
if StoragePath == nil {
|
||||
fmt.Println("StoragePath error!")
|
||||
StoragePath = []byte("downloads")
|
||||
}
|
||||
Hash = b.Get([]byte("InfoHash"))
|
||||
if Hash == nil {
|
||||
fmt.Println("Hash error!")
|
||||
}
|
||||
TorrentName = b.Get([]byte("TorrentName"))
|
||||
if TorrentName == nil {
|
||||
fmt.Println("Torrent Name not found")
|
||||
TorrentName = []byte("Not Found!")
|
||||
}
|
||||
TorrentStatus = b.Get([]byte("TorrentStatus"))
|
||||
if TorrentStatus == nil {
|
||||
//fmt.Println("Torrent Status not found in local storage")
|
||||
TorrentStatus = []byte("")
|
||||
}
|
||||
TorrentType = b.Get([]byte("TorrentType"))
|
||||
if TorrentType == nil {
|
||||
fmt.Println("Torrent Type not found in local storage")
|
||||
TorrentStatus = []byte("")
|
||||
}
|
||||
TorrentFileName = b.Get([]byte("TorrentFileName"))
|
||||
if TorrentFileName == nil {
|
||||
fmt.Println("Torrent File Name not found in local storage")
|
||||
TorrentFileName = []byte("")
|
||||
}
|
||||
|
||||
torrentLocal.DateAdded = string(Dateadded)
|
||||
torrentLocal.StoragePath = string(StoragePath)
|
||||
torrentLocal.Hash = string(Hash) //Converting the byte slice back into the full hash
|
||||
torrentLocal.TorrentName = string(TorrentName)
|
||||
torrentLocal.TorrentStatus = string(TorrentStatus)
|
||||
torrentLocal.TorrentType = string(TorrentType)
|
||||
torrentLocal.TorrentFileName = string(TorrentFileName)
|
||||
|
||||
//fmt.Println("Torrentlocal list: ", torrentLocal)
|
||||
torrentLocalArray = append(torrentLocalArray, torrentLocal) //dumping it into the array
|
||||
return nil
|
||||
})
|
||||
return nil
|
||||
})
|
||||
func ReadInTorrents(torrentStorage *storm.DB) (torrentLocalArray []*TorrentLocal) {
|
||||
err := torrentStorage.Init(&TorrentLocal{}) //initializing buckets and indexes since this function runs on start
|
||||
if err != nil {
|
||||
fmt.Println("Error initializing and indexing database....", err)
|
||||
}
|
||||
torrentLocalArray = []*TorrentLocal{} //creating the array of the torrentlocal struct
|
||||
|
||||
err = torrentStorage.All(&torrentLocalArray) //unmarshalling the database into the []torrentlocal
|
||||
if err != nil {
|
||||
fmt.Println("Error reading database into torrentLocalArray", err)
|
||||
}
|
||||
return torrentLocalArray //all done, return the entire Array to add to the torrent client
|
||||
}
|
||||
|
||||
//AddTorrentLocalStorage is called when adding a new torrent via any method, requires the boltdb pointer and the torrentlocal struct
|
||||
func AddTorrentLocalStorage(torrentStorage *bolt.DB, local *TorrentLocal) {
|
||||
func AddTorrentLocalStorage(torrentStorage *storm.DB, local TorrentLocal) {
|
||||
println("Adding Local storage information")
|
||||
|
||||
torrentStorage.Update(func(tx *bolt.Tx) error {
|
||||
b, err := tx.CreateBucketIfNotExists([]byte(local.Hash)) //translating hash into bytes for storage
|
||||
if err != nil {
|
||||
return fmt.Errorf("create bucket %s", err)
|
||||
}
|
||||
err = b.Put([]byte("Date"), []byte(local.DateAdded)) //TODO error checking marshall into JSON
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = b.Put([]byte("StoragePath"), []byte(local.StoragePath))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = b.Put([]byte("InfoHash"), []byte(local.Hash))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = b.Put([]byte("TorrentName"), []byte(local.TorrentName))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = b.Put([]byte("TorrentType"), []byte(local.TorrentType))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = b.Put([]byte("TorrentFileName"), []byte(local.TorrentFileName))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = b.Put([]byte("UploadRatio"), []byte(local.UploadRatio))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
err := torrentStorage.Save(&local)
|
||||
if err != nil {
|
||||
fmt.Println("Error adding new Torrent to database", err)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//DelTorrentLocalStorage is called to delete a torrent when we fail (for whatever reason to load the information for it). Deleted by HASH matching.
|
||||
func DelTorrentLocalStorage(torrentStorage *bolt.DB, local *TorrentLocal) {
|
||||
func DelTorrentLocalStorage(torrentStorage *storm.DB, local *TorrentLocal) { //TODO do a ONE and purge the torrent that way
|
||||
println("Deleting torrent", local.TorrentFileName)
|
||||
|
||||
torrentStorage.Update(func(tx *bolt.Tx) error {
|
||||
err := tx.DeleteBucket([]byte(local.Hash))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
err := torrentStorage.DeleteStruct(&local)
|
||||
if err != nil {
|
||||
fmt.Println("Error deleting torrent from database", err)
|
||||
}
|
||||
}
|
||||
|
||||
//UpdateStorageTick updates the values in boltdb that should update on every tick (like uploadratio or uploadedbytes, not downloaded since we should have the actual file)
|
||||
func UpdateStorageTick(torrentStorage *bolt.DB, torrentLocal TorrentLocal) {
|
||||
UploadedBytes := make([]byte, 8)
|
||||
binary.LittleEndian.PutUint64(UploadedBytes, uint64(torrentLocal.UploadedBytes)) //converting int64 into byte slice for storage
|
||||
selectedHash := []byte(torrentLocal.Hash)
|
||||
torrentStorage.Update(func(tx *bolt.Tx) error {
|
||||
b := tx.Bucket(selectedHash)
|
||||
err := b.Put([]byte("UploadRatio"), []byte(torrentLocal.UploadRatio))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = b.Put([]byte("UploadedBytes"), []byte(UploadedBytes))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
func UpdateStorageTick(torrentStorage *storm.DB, torrentLocal TorrentLocal) {
|
||||
err := torrentStorage.Update(&torrentLocal)
|
||||
if err != nil {
|
||||
fmt.Println("Error performing tick update to database", err)
|
||||
}
|
||||
}
|
||||
|
||||
//FetchTorrentFromStorage grabs the localtorrent info from the bolt database for usage found by torrenthash
|
||||
func FetchTorrentFromStorage(torrentStorage *bolt.DB, selectedHash []byte) TorrentLocal {
|
||||
func FetchTorrentFromStorage(torrentStorage *storm.DB, selectedHash string) TorrentLocal {
|
||||
|
||||
singleTorrentInfo := TorrentLocal{}
|
||||
torrentStorage.View(func(tx *bolt.Tx) error {
|
||||
b := tx.Bucket(selectedHash)
|
||||
var Dateadded []byte
|
||||
var StoragePath []byte
|
||||
var Hash []byte
|
||||
var TorrentName []byte
|
||||
var TorrentStatus []byte
|
||||
var TorrentType []byte
|
||||
var TorrentFileName []byte
|
||||
Dateadded = b.Get([]byte("Date"))
|
||||
if Dateadded == nil {
|
||||
fmt.Println("Date added error!")
|
||||
Dateadded = []byte(time.Now().Format("Jan _2 2006"))
|
||||
}
|
||||
StoragePath = b.Get([]byte("StoragePath"))
|
||||
if StoragePath == nil {
|
||||
fmt.Println("StoragePath error!")
|
||||
StoragePath = []byte("downloads")
|
||||
}
|
||||
Hash = b.Get([]byte("InfoHash"))
|
||||
if Hash == nil {
|
||||
fmt.Println("Hash error!")
|
||||
}
|
||||
TorrentName = b.Get([]byte("TorrentName"))
|
||||
if TorrentName == nil {
|
||||
fmt.Println("Torrent Name not found")
|
||||
TorrentName = []byte("Not Found!")
|
||||
}
|
||||
TorrentStatus = b.Get([]byte("TorrentStatus"))
|
||||
if TorrentStatus == nil {
|
||||
//fmt.Println("Torrent Status not found in local storage")
|
||||
TorrentStatus = []byte("")
|
||||
}
|
||||
TorrentType = b.Get([]byte("TorrentType"))
|
||||
if TorrentType == nil {
|
||||
fmt.Println("Torrent Type not found in local storage")
|
||||
TorrentStatus = []byte("")
|
||||
}
|
||||
TorrentFileName = b.Get([]byte("TorrentFileName"))
|
||||
if TorrentFileName == nil {
|
||||
fmt.Println("Torrent File Name not found in local storage")
|
||||
TorrentFileName = []byte("")
|
||||
}
|
||||
err := torrentStorage.One("Hash", selectedHash, &singleTorrentInfo)
|
||||
if err != nil {
|
||||
fmt.Println("Failure selecting single torrent!", err)
|
||||
}
|
||||
|
||||
singleTorrentInfo.DateAdded = string(Dateadded)
|
||||
singleTorrentInfo.StoragePath = string(StoragePath)
|
||||
singleTorrentInfo.Hash = string(Hash) //Converting the byte slice back into the full hash
|
||||
singleTorrentInfo.TorrentName = string(TorrentName)
|
||||
singleTorrentInfo.TorrentStatus = string(TorrentStatus)
|
||||
singleTorrentInfo.TorrentType = string(TorrentType)
|
||||
singleTorrentInfo.TorrentFileName = string(TorrentFileName)
|
||||
|
||||
return nil
|
||||
})
|
||||
return singleTorrentInfo
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user