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

Handle finished downloads that weren't removed from the queue #683

Merged
merged 1 commit into from
Sep 16, 2023
Merged

Handle finished downloads that weren't removed from the queue #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/Downloader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.ensureActive
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import mu.KLogger
import mu.KotlinLogging
import org.jetbrains.exposed.sql.and
import org.jetbrains.exposed.sql.transactions.transaction
Expand Down Expand Up @@ -83,17 +84,32 @@ class Downloader(
logger.debug { "stopped" }
}

private suspend fun finishDownload(logger: KLogger, download: DownloadChapter) {
downloadQueue.removeIf { it.mangaId == download.mangaId && it.chapterIndex == download.chapterIndex }
step(null, false)
logger.debug { "finished" }
onDownloadFinished()
}

private suspend fun run() {
while (downloadQueue.isNotEmpty() && currentCoroutineContext().isActive) {
val download = availableSourceDownloads.firstOrNull {
(it.state == Queued || (it.state == Error && it.tries < 3)) // 3 re-tries per download
(it.state == Queued || it.state == Finished || (it.state == Error && it.tries < 3)) // 3 re-tries per download
} ?: break

val logContext = "${logger.name} - downloadChapter($download))"
val downloadLogger = KotlinLogging.logger(logContext)

downloadLogger.debug { "start" }

// handle cases were the downloader was stopped before the finished download could be removed from the queue
// otherwise, it will create an endless loop, due to never removing the finished chapter and thinking that the
// current download chapter was moved down in the queue
if (download.state == Finished) {
finishDownload(downloadLogger, download)
break
}

try {
download.state = Downloading
step(download, true)
Expand All @@ -109,11 +125,7 @@ class Downloader(
}
}
step(download, true)

downloadQueue.removeIf { it.mangaId == download.mangaId && it.chapterIndex == download.chapterIndex }
step(null, false)
downloadLogger.debug { "finished" }
onDownloadFinished()
finishDownload(downloadLogger, download)
} catch (e: CancellationException) {
logger.debug("Downloader was stopped")
availableSourceDownloads.filter { it.state == Downloading }.forEach { it.state = Queued }
Expand Down
Loading