sync from master

server/torr/storage/torrstor/cache.go

@@ -239,7 +239,7 @@ func (c *Cache) getRemPieces() []*Piece {
 		}
 	}
 
-	c.updatePriority()
+	c.clearPriority()
 
 	c.muReaders.Lock()
 	for r, _ := range c.readers {
@@ -328,10 +328,10 @@ func (c *Cache) CloseReader(r *Reader) {
 	r.Close()
 	delete(r.cache.readers, r)
 	r.cache.muReaders.Unlock()
-	go c.updatePriority()
+	go c.clearPriority()
 }
 
-func (c *Cache) updatePriority() {
+func (c *Cache) clearPriority() {
 	time.Sleep(time.Second)
 	ranges := make([]Range, 0)
 	c.muReaders.Lock()

server/torr/storage/torrstor/diskpiece.go

@@ -8,8 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/anacrolix/torrent"
-
 	"server/log"
 	"server/settings"
 )
@@ -84,6 +82,4 @@ func (p *DiskPiece) Release() {
 	p.piece.Complete = false
 
 	os.Remove(p.name)
-
-	p.piece.cache.torrent.Piece(p.piece.Id).SetPriority(torrent.PiecePriorityNone)
 }

server/torr/storage/torrstor/mempiece.go

@@ -4,8 +4,6 @@ import (
 	"io"
 	"sync"
 	"time"
-
-	"github.com/anacrolix/torrent"
 )
 
 type MemPiece struct {
@@ -69,6 +67,4 @@ func (p *MemPiece) Release() {
 	}
 	p.piece.Size = 0
 	p.piece.Complete = false
-
-	p.piece.cache.torrent.Piece(p.piece.Id).SetPriority(torrent.PiecePriorityNone)
 }

server/torr/storage/torrstor/piece.go

@@ -1,6 +1,7 @@
 package torrstor
 
 import (
+	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/storage"
 	"server/settings"
 )
@@ -73,9 +74,8 @@ func (p *Piece) Release() {
 	} else {
 		p.dPiece.Release()
 	}
-// 	if !p.cache.isClosed {
-// 		p.cache.torrent.Piece(p.Id).SetPriority(torrent.PiecePriorityNone)
-// 		// fix remove pieces hash
-// 		p.cache.torrent.Piece(p.Id).UpdateCompletion()
-// 	}
+	if !p.cache.isClosed {
+		p.cache.torrent.Piece(p.Id).SetPriority(torrent.PiecePriorityNone)
+		p.cache.torrent.Piece(p.Id).UpdateCompletion()
+	}
 }

server/torr/storage/torrstor/reader.go

@@ -145,6 +145,7 @@ func (r *Reader) getPieceNum(offset int64) int {
 func (r *Reader) getOffsetRange() (int64, int64) {
 
 	if time.Now().Unix() > r.lastAccess+60 && len(r.cache.readers) > 1 {
+		r.SetReadahead(0)
 		return r.file.Offset(), r.file.Offset()
 	}