sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

change pieces prior set

Browse Source
This commit is contained in:
YouROK
2021-02-19 00:21:23 +03:00
parent c9de021f0a
commit 2b1e66cf59
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/torr/storage/torrstor/cache.go
View File

@@ -165,7 +165,7 @@ func (c *Cache) cleanPieces() {
remPieces := c.getRemPieces() remPieces := c.getRemPieces()
if c.filled > c.capacity { if c.filled > c.capacity {
rems := (c.filled - c.capacity) / c.pieceLength rems := (c.filled-c.capacity)/c.pieceLength + 1
for _, p := range remPieces { for _, p := range remPieces {
c.removePiece(p) c.removePiece(p)
rems-- rems--
@@ -192,19 +192,23 @@ func (c *Cache) getRemPieces() []*Piece {
if p.Size > 0 { if p.Size > 0 {
fill += p.Size fill += p.Size
} }
piece := c.torrent.Piece(id)
state := piece.State()
if len(ranges) > 0 { if len(ranges) > 0 {
if !inRanges(ranges, id) { if !inRanges(ranges, id) {
piece := c.torrent.Piece(id) if state.Priority != torrent.PiecePriorityNone {
if piece.State().Priority != torrent.PiecePriorityNone {
piece.SetPriority(torrent.PiecePriorityNone) piece.SetPriority(torrent.PiecePriorityNone)
} }
if p.Size > 0 { if p.Size > 0 {
piecesRemove = append(piecesRemove, p) piecesRemove = append(piecesRemove, p)
} }
} else {
if state.Priority != torrent.PiecePriorityNow && state.Priority != torrent.PiecePriorityReadahead && state.Priority != torrent.PiecePriorityNormal {
piece.SetPriority(torrent.PiecePriorityNormal)
}
} }
} else { } else {
piece := c.torrent.Piece(id) if state.Priority != torrent.PiecePriorityNone {
if piece.State().Priority != torrent.PiecePriorityNone {
piece.SetPriority(torrent.PiecePriorityNone) piece.SetPriority(torrent.PiecePriorityNone)
} }
} }

3
server/torr/storage/torrstor/reader.go
View File

@@ -19,6 +19,7 @@ type Reader struct {
///Preload ///Preload
muPreload sync.Mutex muPreload sync.Mutex
ranges Range
} }
func newReader(file *torrent.File, cache *Cache) *Reader { func newReader(file *torrent.File, cache *Cache) *Reader {
@@ -60,7 +61,7 @@ func (r *Reader) Read(p []byte) (n int, err error) {
if r.file.Torrent() != nil && r.file.Torrent().Info() != nil { if r.file.Torrent() != nil && r.file.Torrent().Info() != nil {
n, err = r.Reader.Read(p) n, err = r.Reader.Read(p)
r.offset += int64(n) r.offset += int64(n)
go r.preload() //go r.preload()
} else { } else {
log.TLogln("Torrent closed and readed") log.TLogln("Torrent closed and readed")
} }

7
server/torr/storage/torrstor/readerloader.go
View File

@@ -40,8 +40,13 @@ func (r *Reader) getOffsetRange() (int64, int64) {
} }
func (r *Reader) preload() { func (r *Reader) preload() {
torr := r.file.Torrent()
rrange := r.getPiecesRange() rrange := r.getPiecesRange()
if rrange.Start == r.ranges.Start && rrange.End == r.ranges.End {
return
}
torr := r.file.Torrent()
r.ranges = rrange
rahPiece := int(r.readahead / torr.Info().PieceLength) rahPiece := int(r.readahead / torr.Info().PieceLength)
readerPiece := r.getReaderPiece() readerPiece := r.getReaderPiece()