Start working on Batch chapter downloading

2025-12-10 06:42:05 +01:00 · 2022-11-06 17:14:16 -05:00
parent 028383bf6a
commit 604626f378
10 changed files with 96 additions and 31 deletions
--- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt
+++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt
@@ -92,18 +92,6 @@ interface ChapterRepository {
        @Path("chapterIndex") chapterIndex: Int
    ): Flow<HttpResponse>

-    @GET("api/v1/download/{mangaId}/chapter/{chapterIndex}")
-    fun queueChapterDownload(
-        @Path("mangaId") mangaId: Long,
-        @Path("chapterIndex") chapterIndex: Int
-    ): Flow<HttpResponse>
-
-    @DELETE("api/v1/download/{mangaId}/chapter/{chapterIndex}")
-    fun stopChapterDownload(
-        @Path("mangaId") mangaId: Long,
-        @Path("chapterIndex") chapterIndex: Int
-    ): Flow<HttpResponse>
-
    @FormUrlEncoded
    @PATCH("api/v1/manga/{mangaId}/chapter/{chapterIndex}/meta")
    fun updateChapterMeta(
--- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt
+++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt
@@ -0,0 +1,39 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ca.gosyer.jui.domain.download.interactor
+
+import ca.gosyer.jui.domain.download.model.DownloadEnqueue
+import ca.gosyer.jui.domain.download.service.DownloadRepository
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
+import me.tatarka.inject.annotations.Inject
+import org.lighthousegames.logging.logging
+
+class BatchChapterDownload @Inject constructor(private val downloadRepository: DownloadRepository) {
+
+    suspend fun await(chapterIds: List<Long>, onError: suspend (Throwable) -> Unit = {}) = asFlow(chapterIds)
+        .catch {
+            onError(it)
+            log.warn(it) { "Failed to queue chapters $chapterIds for a download" }
+        }
+        .collect()
+
+    suspend fun await(vararg chapterIds: Long, onError: suspend (Throwable) -> Unit = {}) = asFlow(*chapterIds)
+        .catch {
+            onError(it)
+            log.warn(it) { "Failed to queue chapters ${chapterIds.asList()} for a download" }
+        }
+        .collect()
+
+    fun asFlow(chapterIds: List<Long>) = downloadRepository.batchDownload(DownloadEnqueue(chapterIds))
+
+    fun asFlow(vararg chapterIds: Long) = downloadRepository.batchDownload(DownloadEnqueue(chapterIds.asList()))
+
+    companion object {
+        private val log = logging()
+    }
+}
--- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt
+++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt
@@ -4,17 +4,17 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-package ca.gosyer.jui.domain.chapter.interactor
+package ca.gosyer.jui.domain.download.interactor

 import ca.gosyer.jui.domain.chapter.model.Chapter
-import ca.gosyer.jui.domain.chapter.service.ChapterRepository
+import ca.gosyer.jui.domain.download.service.DownloadRepository
 import ca.gosyer.jui.domain.manga.model.Manga
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
 import me.tatarka.inject.annotations.Inject
 import org.lighthousegames.logging.logging

-class QueueChapterDownload @Inject constructor(private val chapterRepository: ChapterRepository) {
+class QueueChapterDownload @Inject constructor(private val downloadRepository: DownloadRepository) {

    suspend fun await(mangaId: Long, index: Int, onError: suspend (Throwable) -> Unit = {}) = asFlow(mangaId, index)
        .catch {
@@ -37,11 +37,11 @@ class QueueChapterDownload @Inject constructor(private val chapterRepository: Ch
        }
        .collect()

-    fun asFlow(mangaId: Long, index: Int) = chapterRepository.queueChapterDownload(mangaId, index)
+    fun asFlow(mangaId: Long, index: Int) = downloadRepository.queueChapterDownload(mangaId, index)

-    fun asFlow(manga: Manga, index: Int) = chapterRepository.queueChapterDownload(manga.id, index)
+    fun asFlow(manga: Manga, index: Int) = downloadRepository.queueChapterDownload(manga.id, index)

-    fun asFlow(chapter: Chapter) = chapterRepository.queueChapterDownload(chapter.mangaId, chapter.index)
+    fun asFlow(chapter: Chapter) = downloadRepository.queueChapterDownload(chapter.mangaId, chapter.index)

    companion object {
        private val log = logging()
--- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt
+++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt
@@ -4,17 +4,17 @@
 * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 */

-package ca.gosyer.jui.domain.chapter.interactor
+package ca.gosyer.jui.domain.download.interactor

 import ca.gosyer.jui.domain.chapter.model.Chapter
-import ca.gosyer.jui.domain.chapter.service.ChapterRepository
+import ca.gosyer.jui.domain.download.service.DownloadRepository
 import ca.gosyer.jui.domain.manga.model.Manga
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
 import me.tatarka.inject.annotations.Inject
 import org.lighthousegames.logging.logging

-class StopChapterDownload @Inject constructor(private val chapterRepository: ChapterRepository) {
+class StopChapterDownload @Inject constructor(private val downloadRepository: DownloadRepository) {

    suspend fun await(mangaId: Long, index: Int, onError: suspend (Throwable) -> Unit = {}) = asFlow(mangaId, index)
        .catch {
@@ -37,11 +37,11 @@ class StopChapterDownload @Inject constructor(private val chapterRepository: Cha
        }
        .collect()

-    fun asFlow(mangaId: Long, index: Int) = chapterRepository.stopChapterDownload(mangaId, index)
+    fun asFlow(mangaId: Long, index: Int) = downloadRepository.stopChapterDownload(mangaId, index)

-    fun asFlow(manga: Manga, index: Int) = chapterRepository.stopChapterDownload(manga.id, index)
+    fun asFlow(manga: Manga, index: Int) = downloadRepository.stopChapterDownload(manga.id, index)

-    fun asFlow(chapter: Chapter) = chapterRepository.stopChapterDownload(chapter.mangaId, chapter.index)
+    fun asFlow(chapter: Chapter) = downloadRepository.stopChapterDownload(chapter.mangaId, chapter.index)

    companion object {
        private val log = logging()
--- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/model/DownloadEnqueue.kt
+++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/model/DownloadEnqueue.kt
@@ -0,0 +1,14 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ca.gosyer.jui.domain.download.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DownloadEnqueue(
+    val chapterIds: List<Long>
+)
--- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepository.kt
+++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepository.kt
@@ -6,7 +6,13 @@

 package ca.gosyer.jui.domain.download.service

+import ca.gosyer.jui.domain.download.model.DownloadEnqueue
+import de.jensklingenberg.ktorfit.http.Body
+import de.jensklingenberg.ktorfit.http.DELETE
 import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.Headers
+import de.jensklingenberg.ktorfit.http.POST
+import de.jensklingenberg.ktorfit.http.Path
 import io.ktor.client.statement.HttpResponse
 import kotlinx.coroutines.flow.Flow

@@ -19,4 +25,22 @@ interface DownloadRepository {

    @GET("api/v1/downloads/clear")
    fun clearDownloadQueue(): Flow<HttpResponse>
+
+    @GET("api/v1/download/{mangaId}/chapter/{chapterIndex}")
+    fun queueChapterDownload(
+        @Path("mangaId") mangaId: Long,
+        @Path("chapterIndex") chapterIndex: Int
+    ): Flow<HttpResponse>
+
+    @DELETE("api/v1/download/{mangaId}/chapter/{chapterIndex}")
+    fun stopChapterDownload(
+        @Path("mangaId") mangaId: Long,
+        @Path("chapterIndex") chapterIndex: Int
+    ): Flow<HttpResponse>
+
+    @POST("api/v1/download/batch")
+    @Headers("Content-Type: application/json")
+    fun batchDownload(
+        @Body downloadEnqueue: DownloadEnqueue
+    ): Flow<HttpResponse>
 }
--- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt
+++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/chapter/ChapterDownloadButtons.kt
@@ -33,8 +33,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import ca.gosyer.jui.domain.chapter.interactor.DeleteChapterDownload
-import ca.gosyer.jui.domain.chapter.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.chapter.model.Chapter
+import ca.gosyer.jui.domain.download.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.download.model.DownloadChapter
 import ca.gosyer.jui.domain.download.model.DownloadState
 import ca.gosyer.jui.domain.manga.model.Manga
--- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt
+++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/downloads/DownloadsScreenViewModel.kt
@@ -7,11 +7,11 @@
 package ca.gosyer.jui.ui.downloads

 import ca.gosyer.jui.domain.base.WebsocketService.Actions
-import ca.gosyer.jui.domain.chapter.interactor.QueueChapterDownload
-import ca.gosyer.jui.domain.chapter.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.chapter.model.Chapter
 import ca.gosyer.jui.domain.download.interactor.ClearDownloadQueue
+import ca.gosyer.jui.domain.download.interactor.QueueChapterDownload
 import ca.gosyer.jui.domain.download.interactor.StartDownloading
+import ca.gosyer.jui.domain.download.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.download.interactor.StopDownloading
 import ca.gosyer.jui.domain.download.service.DownloadService
 import ca.gosyer.jui.uicore.vm.ContextWrapper
--- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt
+++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/manga/MangaScreenViewModel.kt
@@ -15,13 +15,13 @@ import ca.gosyer.jui.domain.category.interactor.RemoveMangaFromCategory
 import ca.gosyer.jui.domain.category.model.Category
 import ca.gosyer.jui.domain.chapter.interactor.DeleteChapterDownload
 import ca.gosyer.jui.domain.chapter.interactor.GetChapters
-import ca.gosyer.jui.domain.chapter.interactor.QueueChapterDownload
 import ca.gosyer.jui.domain.chapter.interactor.RefreshChapters
-import ca.gosyer.jui.domain.chapter.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.chapter.interactor.UpdateChapterBookmarked
 import ca.gosyer.jui.domain.chapter.interactor.UpdateChapterMarkPreviousRead
 import ca.gosyer.jui.domain.chapter.interactor.UpdateChapterRead
 import ca.gosyer.jui.domain.chapter.model.Chapter
+import ca.gosyer.jui.domain.download.interactor.QueueChapterDownload
+import ca.gosyer.jui.domain.download.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.download.service.DownloadService
 import ca.gosyer.jui.domain.library.interactor.AddMangaToLibrary
 import ca.gosyer.jui.domain.library.interactor.RemoveMangaFromLibrary
--- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt
+++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/updates/UpdatesScreenViewModel.kt
@@ -7,9 +7,9 @@
 package ca.gosyer.jui.ui.updates

 import ca.gosyer.jui.domain.chapter.interactor.DeleteChapterDownload
-import ca.gosyer.jui.domain.chapter.interactor.QueueChapterDownload
-import ca.gosyer.jui.domain.chapter.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.chapter.model.Chapter
+import ca.gosyer.jui.domain.download.interactor.QueueChapterDownload
+import ca.gosyer.jui.domain.download.interactor.StopChapterDownload
 import ca.gosyer.jui.domain.download.service.DownloadService
 import ca.gosyer.jui.domain.updates.interactor.GetRecentUpdates
 import ca.gosyer.jui.ui.base.chapter.ChapterDownloadItem