Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix TorrentDownloadController #1208

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+430 −21
Open

Fix TorrentDownloadController #1208

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1ce487
Fix TorrentDownloadController
StageGuard Nov 16, 2024
3f96b7b
Fix footer
StageGuard Nov 16, 2024
08c50f6
Fix onSeek will fill piece which has downloaded.
StageGuard Nov 16, 2024
41b4d12
expand lastIndex to the last piece index in piece list, contains foot…
StageGuard Nov 16, 2024
92eac52
Add unit test
StageGuard Nov 16, 2024
38066dc
Always add footer piece which hasn't downloaded when seek
StageGuard Nov 17, 2024
5d41f62
add more test
StageGuard Nov 17, 2024
fd99103
fix import
StageGuard Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions torrent/api/src/commonMain/kotlin/api/pieces/TorrentDownloadController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,21 @@ class TorrentDownloadController(
private val footerSize: Long = headerSize,
private val possibleFooterSize: Long = headerSize,
) : SynchronizedObject() {
private val totalSize: Long = pieces.sumOf { it.size }
private val totalPieceSize: Long = pieces.sumOf { it.size }
private val pieceOffsetStart = with(pieces) { pieces.first().dataStartOffset }

private val footerPieces = pieces.dropWhile { it.dataLastOffset < totalSize - footerSize }
private val possibleFooterRange = pieces.dropWhile { it.dataLastOffset < totalSize - possibleFooterSize }
private val footerPieces = pieces.dropWhile { it.dataLastOffset < pieceOffsetStart + totalPieceSize - footerSize }
private val possibleFooterRange = pieces
.dropWhile { it.dataLastOffset < pieceOffsetStart + totalPieceSize - possibleFooterSize }
.let {
if (it.isEmpty()) IntRange.EMPTY
else it.first().pieceIndex..it.last().pieceIndex
}

private val lastIndex = pieces.pieceIndexOfFirst { it.dataLastOffset >= totalSize - footerSize } - 1
private val lastIndex = pieces
.pieceIndexOfFirst { it.dataLastOffset >= pieceOffsetStart + totalPieceSize - footerSize } - 1

private var currentWindowStart = 0
private var currentWindowStart = pieces.initialPieceIndex

// inclusive
private var currentWindowEnd = (currentWindowStart + windowSize - 1).coerceAtMost(lastIndex)
Expand All @@ -88,7 +91,7 @@ class TorrentDownloadController(
}

fun onTorrentResumed() = synchronized(this) {
onSeek(0)
onSeek(pieces.initialPieceIndex)
}

fun onSeek(pieceIndex: Int) = synchronized(this) {
Expand Down
Loading