Emit update to clients after adding all mangas to the queue (#521)

Emitting updates before all the mangas were added to the queue could lead to e.g. wrong progress calculation.
This commit is contained in:
schroda
2023-03-25 19:38:42 +01:00
committed by GitHub
parent 5b61bdc3a8
commit dcde4947e8
4 changed files with 17 additions and 14 deletions
@@ -93,14 +93,13 @@ object UpdateController {
if (clear) {
updater.reset()
}
categories
.flatMap { CategoryManga.getCategoryMangaList(it.id) }
.distinctBy { it.id }
.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, MangaDataClass::title))
.filter { it.updateStrategy == UpdateStrategy.ALWAYS_UPDATE }
.forEach { manga ->
updater.addMangaToQueue(manga)
}
updater.addMangasToQueue(
categories
.flatMap { CategoryManga.getCategoryMangaList(it.id) }
.distinctBy { it.id }
.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, MangaDataClass::title))
.filter { it.updateStrategy == UpdateStrategy.ALWAYS_UPDATE }
)
}
fun categoryUpdateWS(ws: WsConfig) {
@@ -4,7 +4,7 @@ import kotlinx.coroutines.flow.StateFlow
import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
interface IUpdater {
fun addMangaToQueue(manga: MangaDataClass)
fun addMangasToQueue(mangas: List<MangaDataClass>)
val status: StateFlow<UpdateStatus>
fun reset()
}
@@ -74,13 +74,17 @@ class Updater : IUpdater {
return tracker.values.toList()
}
override fun addMangaToQueue(manga: MangaDataClass) {
override fun addMangasToQueue(mangas: List<MangaDataClass>) {
mangas.forEach { tracker[it.id] = UpdateJob(it) }
_status.update { UpdateStatus(tracker.values.toList(), true) }
mangas.forEach { addMangaToQueue(it) }
}
private fun addMangaToQueue(manga: MangaDataClass) {
val updateChannel = getOrCreateUpdateChannelFor(manga.sourceId)
scope.launch {
updateChannel.send(UpdateJob(manga))
}
tracker[manga.id] = UpdateJob(manga)
_status.update { UpdateStatus(tracker.values.toList(), true) }
}
override fun reset() {
@@ -13,8 +13,8 @@ class TestUpdater : IUpdater {
private val _status = MutableStateFlow(UpdateStatus())
override val status: StateFlow<UpdateStatus> = _status.asStateFlow()
override fun addMangaToQueue(manga: MangaDataClass) {
updateQueue.add(UpdateJob(manga))
override fun addMangasToQueue(mangas: List<MangaDataClass>) {
mangas.forEach { updateQueue.add(UpdateJob(it)) }
isRunning = true
updateStatus()
}