diff --git a/server/torr/state/state.go b/server/torr/state/state.go index be9fd02..7e79ccf 100644 --- a/server/torr/state/state.go +++ b/server/torr/state/state.go @@ -1,9 +1,5 @@ package state -import ( - "server/torr/storage/reader" -) - type TorrentStat int func (t TorrentStat) String() string { @@ -66,8 +62,6 @@ type TorrentStatus struct { PiecesDirtiedGood int64 `json:"pieces_dirtied_good,omitempty"` PiecesDirtiedBad int64 `json:"pieces_dirtied_bad,omitempty"` - Readers []*reader.ReaderState `json:"readers,omitempty"` - FileStats []*TorrentFileStat `json:"file_stats,omitempty"` } diff --git a/server/torr/storage/reader/state.go b/server/torr/storage/reader/state.go deleted file mode 100644 index c38bbbe..0000000 --- a/server/torr/storage/reader/state.go +++ /dev/null @@ -1,7 +0,0 @@ -package reader - -type ReaderState struct { - Start int - End int - Reader int -} diff --git a/server/torr/storage/state/state.go b/server/torr/storage/state/state.go index 0daa755..306c9b0 100644 --- a/server/torr/storage/state/state.go +++ b/server/torr/storage/state/state.go @@ -2,7 +2,6 @@ package state import ( "server/torr/state" - "server/torr/storage/reader" ) type CacheState struct { @@ -13,7 +12,7 @@ type CacheState struct { PiecesCount int Torrent *state.TorrentStatus Pieces map[int]ItemState - Readers []*reader.ReaderState + Readers []*ReaderState } type ItemState struct { @@ -22,3 +21,9 @@ type ItemState struct { Size int64 Completed bool } + +type ReaderState struct { + Start int + End int + Reader int +} diff --git a/server/torr/storage/torrstor/cache.go b/server/torr/storage/torrstor/cache.go index 206a9a9..3a38bc2 100644 --- a/server/torr/storage/torrstor/cache.go +++ b/server/torr/storage/torrstor/cache.go @@ -13,7 +13,6 @@ import ( "server/log" "server/settings" - "server/torr/storage/reader" "server/torr/storage/state" "server/torr/utils" @@ -150,12 +149,12 @@ func (c *Cache) GetState() *state.CacheState { } } - readersState := make([]*reader.ReaderState, 0) + readersState := make([]*state.ReaderState, 0) c.muReaders.Lock() for r, _ := range c.readers { rng := r.getPiecesRange() pc := r.getReaderPiece() - readersState = append(readersState, &reader.ReaderState{ + readersState = append(readersState, &state.ReaderState{ Start: rng.Start, End: rng.End, Reader: pc, diff --git a/server/torr/torrent.go b/server/torr/torrent.go index f0858a1..c066e58 100644 --- a/server/torr/torrent.go +++ b/server/torr/torrent.go @@ -428,10 +428,6 @@ func (t *Torrent) Status() *state.TorrentStatus { } } - if t.cache != nil { - st.Readers = t.cache.GetState().Readers - } - return st }