Merge branch 'master' into new-torrent

server/torr/storage/torrstor/cache.go

@@ -215,7 +215,10 @@ func (c *Cache) getRemPieces() []*Piece {
 	ranges := make([]Range, 0)
 	c.muReaders.Lock()
 	for r, _ := range c.readers {
-		ranges = append(ranges, r.getPiecesRange())
+		r.checkReader()
+		if r.isUse {
+			ranges = append(ranges, r.getPiecesRange())
+		}
 	}
 	c.muReaders.Unlock()
 	ranges = mergeRange(ranges)
@@ -243,6 +246,9 @@ func (c *Cache) getRemPieces() []*Piece {
 
 	c.muReaders.Lock()
 	for r, _ := range c.readers {
+		if !r.isUse {
+			continue
+		}
 		if c.isIdInFileBE(ranges, r.getReaderPiece()) {
 			continue
 		}
@@ -336,7 +342,10 @@ func (c *Cache) clearPriority() {
 	ranges := make([]Range, 0)
 	c.muReaders.Lock()
 	for r, _ := range c.readers {
-		ranges = append(ranges, r.getPiecesRange())
+		r.checkReader()
+		if r.isUse {
+			ranges = append(ranges, r.getPiecesRange())
+		}
 	}
 	c.muReaders.Unlock()
 	ranges = mergeRange(ranges)

server/torr/storage/torrstor/reader.go

@@ -23,7 +23,8 @@ type Reader struct {
 
 	///Preload
 	lastAccess int64
-	muPreload  sync.Mutex
+	isUse      bool
+	mu         sync.Mutex
 	ranges     Range
 }
 
@@ -34,6 +35,7 @@ func newReader(file *torrent.File, cache *Cache) *Reader {
 
 	r.SetReadahead(0)
 	r.cache = cache
+	r.isUse = true
 
 	cache.muReaders.Lock()
 	cache.readers[r] = struct{}{}
@@ -53,6 +55,7 @@ func (r *Reader) Seek(offset int64, whence int) (n int64, err error) {
 	case io.SeekEnd:
 		r.offset = r.file.Length() + offset
 	}
+	r.readerOn()
 	n, err = r.Reader.Seek(offset, whence)
 	r.offset = n
 	r.lastAccess = time.Now().Unix()
@@ -65,6 +68,7 @@ func (r *Reader) Read(p []byte) (n int, err error) {
 		return
 	}
 	if r.file.Torrent() != nil && r.file.Torrent().Info() != nil {
+		r.readerOn()
 		n, err = r.Reader.Read(p)
 
 		//samsung tv fix xvid/divx
@@ -94,16 +98,12 @@ func (r *Reader) Read(p []byte) (n int, err error) {
 }
 
 func (r *Reader) SetReadahead(length int64) {
-	if time.Now().Unix() > r.lastAccess+60 && r.cache != nil && len(r.cache.readers) > 1 {
-		//fix read a head on not readed reader
-		r.Reader.SetReadahead(0)
-		r.readahead = 0
-		return
-	}
 	if r.cache != nil && length > r.cache.capacity {
 		length = r.cache.capacity
 	}
-	r.Reader.SetReadahead(length)
+	if r.isUse {
+		r.Reader.SetReadahead(length)
+	}
 	r.readahead = length
 }
 
@@ -143,14 +143,8 @@ 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()
-	}
-
 	prc := int64(settings.BTsets.ReaderReadAHead)
-	readers := int64(len(r.cache.readers))
+	readers := int64(r.getUseReaders())
 	if readers == 0 {
 		readers = 1
 	}
@@ -167,3 +161,47 @@ func (r *Reader) getOffsetRange() (int64, int64) {
 	}
 	return beginOffset, endOffset
 }
+
+func (r *Reader) checkReader() {
+	if time.Now().Unix() > r.lastAccess+60 && len(r.cache.readers) > 1 {
+		r.readerOff()
+	} else {
+		r.readerOn()
+	}
+}
+
+func (r *Reader) readerOn() {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	if !r.isUse {
+		if pos, err := r.Reader.Seek(0, io.SeekCurrent); err == nil && pos == 0 {
+			r.Reader.Seek(r.offset, io.SeekStart)
+		}
+		r.SetReadahead(r.readahead)
+		r.isUse = true
+	}
+}
+
+func (r *Reader) readerOff() {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	if r.isUse {
+		r.SetReadahead(0)
+		r.isUse = false
+		if r.offset > 0 {
+			r.Reader.Seek(0, io.SeekStart)
+		}
+	}
+}
+
+func (r *Reader) getUseReaders() int {
+	readers := 0
+	if r.cache != nil {
+		for reader, _ := range r.cache.readers {
+			if reader.isUse {
+				readers++
+			}
+		}
+	}
+	return readers
+}