package torrent
import (
+ "github.com/RoaringBitmap/roaring"
"github.com/anacrolix/missinggo/v2/bitmap"
"github.com/anacrolix/torrent/metainfo"
// 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()
}
fileEndPieceIndex int,
fileTorrentOffset int64,
fileLength int64,
- torrentCompletedPieces bitmap.Bitmap,
+ torrentCompletedPieces *roaring.Bitmap,
) (left int64) {
numPiecesSpanned := fileEndPieceIndex - fileFirstPieceIndex
switch numPiecesSpanned {
case 0:
case 1:
- if !torrentCompletedPieces.Get(bitmap.BitIndex(fileFirstPieceIndex)) {
+ if !torrentCompletedPieces.Contains(bitmap.BitIndex(fileFirstPieceIndex)) {
left += fileLength
}
default:
- if !torrentCompletedPieces.Get(bitmap.BitIndex(fileFirstPieceIndex)) {
+ if !torrentCompletedPieces.Contains(bitmap.BitIndex(fileFirstPieceIndex)) {
left += torrentUsualPieceSize - (fileTorrentOffset % torrentUsualPieceSize)
}
- if !torrentCompletedPieces.Get(bitmap.BitIndex(fileEndPieceIndex - 1)) {
+ if !torrentCompletedPieces.Contains(bitmap.BitIndex(fileEndPieceIndex - 1)) {
left += fileTorrentOffset + fileLength - int64(fileEndPieceIndex-1)*torrentUsualPieceSize
}
- completedMiddlePieces := torrentCompletedPieces.Copy()
+ completedMiddlePieces := torrentCompletedPieces.Clone()
completedMiddlePieces.RemoveRange(0, bitmap.BitRange(fileFirstPieceIndex+1))
completedMiddlePieces.RemoveRange(bitmap.BitRange(fileEndPieceIndex-1), bitmap.ToEnd)
- left += int64(numPiecesSpanned-2-pieceIndex(completedMiddlePieces.Len())) * torrentUsualPieceSize
+ 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)
}
// The relative file path for a multi-file torrent, and the torrent name for a
}
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
}
}
// 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
}