mirrors/Tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/Tachidesk.git synced 2025-12-10 06:42:07 +01:00
Code Issues Projects Releases Wiki Activity

Download queue missing update fix (#450)

Browse Source 
* Add immediate updates to download queue manager for updates that always needs to be delivered

* Update server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt

Co-authored-by: Mitchell Syer <Mitchellptbo@gmail.com>

* Revert change to make sure that data in status sent to client are actual

* Reduce number of immediate updates to clients

Co-authored-by: Mitchell Syer <Mitchellptbo@gmail.com>
This commit is contained in:
Valter Martinek
2022-11-16 17:33:51 +01:00
committed by GitHub
parent d6127d6811
commit e7cb88c757
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt
View File

@@ -80,19 +80,27 @@ object DownloadManager {
init {
scope.launch {
notifyFlow.sample(1.seconds).collect {
sendStatusToAllClients()
}
}
}
private fun sendStatusToAllClients() {
val status = getStatus()
clients.forEach {
it.value.send(status)
}
}
}
}
private fun notifyAllClients() {
private fun notifyAllClients(immediate: Boolean = false) {
if (immediate) {
sendStatusToAllClients()
} else {
scope.launch {
notifyFlow.emit(Unit)
}
}
}
private fun getStatus(): DownloadStatus {
return DownloadStatus(
@@ -206,7 +214,7 @@ object DownloadManager {
val addedChapters = inputs.mapNotNull { addToQueue(it.first, it.second) }
if (addedChapters.isNotEmpty()) {
start()
notifyAllClients()
notifyAllClients(true)
}
scope.launch {
downloaderWatch.emit(Unit)

22
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/Downloader.kt
View File

@@ -39,15 +39,15 @@ class Downloader(
private val scope: CoroutineScope,
val sourceId: Long,
private val downloadQueue: CopyOnWriteArrayList<DownloadChapter>,
private val notifier: () -> Unit,
private val notifier: (immediate: Boolean) -> Unit,
private val onComplete: () -> Unit
) {
private var job: Job? = null
class StopDownloadException : Exception("Cancelled download")
class PauseDownloadException : Exception("Pause download")
private suspend fun step(download: DownloadChapter?) {
notifier()
private suspend fun step(download: DownloadChapter?, immediate: Boolean) {
notifier(immediate)
currentCoroutineContext().ensureActive()
if (download != null && download != downloadQueue.firstOrNull { it.manga.sourceId.toLong() == sourceId && it.state != Error }) {
if (download in downloadQueue) {
@@ -74,7 +74,7 @@ class Downloader(
}
}
notifier()
notifier(false)
}
suspend fun stop() {
@@ -90,10 +90,10 @@ class Downloader(
try {
download.state = Downloading
step(download)
step(download, true)
download.chapter = getChapterDownloadReady(download.chapterIndex, download.mangaId)
step(download)
step(download, false)
val pageCount = download.chapter.pageCount
for (pageNum in 0 until pageCount) {
@@ -109,7 +109,7 @@ class Downloader(
.distinctUntilChanged()
.onEach {
download.progress = (pageNum.toFloat() + (it.toFloat() * 0.01f)) / pageCount
step(null) // don't throw on canceled download here since we can't do anything
step(null, false) // don't throw on canceled download here since we can't do anything
}
.launchIn(scope)
}
@@ -120,7 +120,7 @@ class Downloader(
}
// TODO: retry on error with 2,4,8 seconds of wait
download.progress = ((pageNum + 1).toFloat()) / pageCount
step(download)
step(download, false)
}
download.state = Finished
transaction {
@@ -128,10 +128,10 @@ class Downloader(
it[isDownloaded] = true
}
}
step(download)
step(download, true)
downloadQueue.removeIf { it.mangaId == download.mangaId && it.chapterIndex == download.chapterIndex }
step(null)
step(null, false)
} catch (e: CancellationException) {
logger.debug("Downloader was stopped")
downloadQueue.filter { it.state == Downloading }.forEach { it.state = Queued }
@@ -142,7 +142,7 @@ class Downloader(
download.tries++
download.state = Error
} finally {
notifier()
notifier(false)
}
}
}