]> Sergey Matveev's repositories - btrtrc.git/blobdiff - file.go
Drop support for go 1.20
[btrtrc.git] / file.go
diff --git a/file.go b/file.go
index f02424000971f46f65583864c7fd1809aac8b841..bea4b13655d6024915434eecc66eeb0cab6524ad 100644 (file)
--- a/file.go
+++ b/file.go
@@ -1,8 +1,7 @@
 package torrent
 
 import (
-       "strings"
-
+       "github.com/RoaringBitmap/roaring"
        "github.com/anacrolix/missinggo/v2/bitmap"
 
        "github.com/anacrolix/torrent/metainfo"
@@ -10,12 +9,13 @@ import (
 
 // Provides access to regions of torrent data that correspond to its files.
 type File struct {
-       t      *Torrent
-       path   string
-       offset int64
-       length int64
-       fi     metainfo.FileInfo
-       prio   piecePriority
+       t           *Torrent
+       path        string
+       offset      int64
+       length      int64
+       fi          metainfo.FileInfo
+       displayPath string
+       prio        piecePriority
 }
 
 func (f *File) Torrent() *Torrent {
@@ -44,13 +44,14 @@ func (f *File) Length() int64 {
 
 // Number of bytes of the entire file we have completed. This is the sum of
 // completed pieces, and dirtied chunks of incomplete pieces.
-func (f *File) BytesCompleted() int64 {
+func (f *File) BytesCompleted() (n int64) {
        f.t.cl.rLock()
-       defer f.t.cl.rUnlock()
-       return f.bytesCompleted()
+       n = f.bytesCompletedLocked()
+       f.t.cl.rUnlock()
+       return
 }
 
-func (f *File) bytesCompleted() int64 {
+func (f *File) bytesCompletedLocked() int64 {
        return f.length - f.bytesLeft()
 }
 
@@ -60,43 +61,65 @@ func fileBytesLeft(
        fileEndPieceIndex int,
        fileTorrentOffset int64,
        fileLength int64,
-       torrentCompletedPieces bitmap.Bitmap,
+       torrentCompletedPieces *roaring.Bitmap,
+       pieceSizeCompletedFn func(pieceIndex int) int64,
 ) (left int64) {
-       numPiecesSpanned := fileEndPieceIndex - fileFirstPieceIndex
-       switch numPiecesSpanned {
-       case 0:
-       case 1:
-               if !torrentCompletedPieces.Get(fileFirstPieceIndex) {
-                       left += fileLength
-               }
-       default:
-               if !torrentCompletedPieces.Get(fileFirstPieceIndex) {
-                       left += torrentUsualPieceSize - (fileTorrentOffset % torrentUsualPieceSize)
-               }
-               if !torrentCompletedPieces.Get(fileEndPieceIndex - 1) {
-                       left += fileTorrentOffset + fileLength - int64(fileEndPieceIndex-1)*torrentUsualPieceSize
+       if fileLength == 0 {
+               return
+       }
+
+       noCompletedMiddlePieces := roaring.New()
+       noCompletedMiddlePieces.AddRange(bitmap.BitRange(fileFirstPieceIndex), bitmap.BitRange(fileEndPieceIndex))
+       noCompletedMiddlePieces.AndNot(torrentCompletedPieces)
+       noCompletedMiddlePieces.Iterate(func(pieceIndex uint32) bool {
+               i := int(pieceIndex)
+               pieceSizeCompleted := pieceSizeCompletedFn(i)
+               if i == fileFirstPieceIndex {
+                       beginOffset := fileTorrentOffset % torrentUsualPieceSize
+                       beginSize := torrentUsualPieceSize - beginOffset
+                       beginDownLoaded := pieceSizeCompleted - beginOffset
+                       if beginDownLoaded < 0 {
+                               beginDownLoaded = 0
+                       }
+                       left += beginSize - beginDownLoaded
+               } else if i == fileEndPieceIndex-1 {
+                       endSize := (fileTorrentOffset + fileLength) % torrentUsualPieceSize
+                       if endSize == 0 {
+                               endSize = torrentUsualPieceSize
+                       }
+                       endDownloaded := pieceSizeCompleted
+                       if endDownloaded > endSize {
+                               endDownloaded = endSize
+                       }
+                       left += endSize - endDownloaded
+               } else {
+                       left += torrentUsualPieceSize - pieceSizeCompleted
                }
-               completedMiddlePieces := torrentCompletedPieces.Copy()
-               completedMiddlePieces.RemoveRange(0, fileFirstPieceIndex+1)
-               completedMiddlePieces.RemoveRange(fileEndPieceIndex-1, bitmap.ToEnd)
-               left += int64(numPiecesSpanned-2-completedMiddlePieces.Len()) * torrentUsualPieceSize
+               return true
+       })
+
+       if left > fileLength {
+               left = fileLength
        }
+       //
+       //numPiecesSpanned := f.EndPieceIndex() - f.BeginPieceIndex()
+       //completedMiddlePieces := f.t._completedPieces.Clone()
+       //completedMiddlePieces.RemoveRange(0, bitmap.BitRange(f.BeginPieceIndex()+1))
+       //completedMiddlePieces.RemoveRange(bitmap.BitRange(f.EndPieceIndex()-1), bitmap.ToEnd)
+       //left += int64(numPiecesSpanned-2-pieceIndex(completedMiddlePieces.GetCardinality())) * torrentUsualPieceSize
        return
 }
 
 func (f *File) bytesLeft() (left int64) {
-       return fileBytesLeft(int64(f.t.usualPieceSize()), f.firstPieceIndex(), f.endPieceIndex(), f.offset, f.length, f.t._completedPieces)
+       return fileBytesLeft(int64(f.t.usualPieceSize()), f.BeginPieceIndex(), f.EndPieceIndex(), f.offset, f.length, &f.t._completedPieces, func(pieceIndex int) int64 {
+               return int64(f.t.piece(pieceIndex).numDirtyBytes())
+       })
 }
 
 // The relative file path for a multi-file torrent, and the torrent name for a
-// single-file torrent.
+// single-file torrent. Dir separators are '/'.
 func (f *File) DisplayPath() string {
-       fip := f.FileInfo().Path
-       if len(fip) == 0 {
-               return f.t.info.Name
-       }
-       return strings.Join(fip, "/")
-
+       return f.displayPath
 }
 
 // The download status of a piece that comprises part of a File.
@@ -145,37 +168,29 @@ func (f *File) Cancel() {
 }
 
 func (f *File) NewReader() Reader {
-       tr := reader{
-               mu:        f.t.cl.locker(),
-               t:         f.t,
-               readahead: 5 * 1024 * 1024,
-               offset:    f.Offset(),
-               length:    f.Length(),
-       }
-       f.t.addReader(&tr)
-       return &tr
+       return f.t.newReader(f.Offset(), f.Length())
 }
 
 // Sets the minimum priority for pieces in the File.
 func (f *File) SetPriority(prio piecePriority) {
        f.t.cl.lock()
-       defer f.t.cl.unlock()
-       if prio == f.prio {
-               return
+       if prio != f.prio {
+               f.prio = prio
+               f.t.updatePiecePriorities(f.BeginPieceIndex(), f.EndPieceIndex(), "File.SetPriority")
        }
-       f.prio = prio
-       f.t.updatePiecePriorities(f.firstPieceIndex(), f.endPieceIndex())
+       f.t.cl.unlock()
 }
 
 // Returns the priority per File.SetPriority.
-func (f *File) Priority() piecePriority {
-       f.t.cl.lock()
-       defer f.t.cl.unlock()
-       return f.prio
+func (f *File) Priority() (prio piecePriority) {
+       f.t.cl.rLock()
+       prio = f.prio
+       f.t.cl.rUnlock()
+       return
 }
 
 // Returns the index of the first piece containing data for the file.
-func (f *File) firstPieceIndex() pieceIndex {
+func (f *File) BeginPieceIndex() int {
        if f.t.usualPieceSize() == 0 {
                return 0
        }
@@ -183,7 +198,7 @@ func (f *File) firstPieceIndex() pieceIndex {
 }
 
 // Returns the index of the piece after the last one containing data for the file.
-func (f *File) endPieceIndex() pieceIndex {
+func (f *File) EndPieceIndex() int {
        if f.t.usualPieceSize() == 0 {
                return 0
        }