Implemented Dowloads front-end

2021-05-30 04:01:49 +04:30
parent 224c24ee9f
commit 5023e96301
13 changed files with 285 additions and 29 deletions
@@ -83,6 +83,7 @@ object DownloadManager {
                    )
                )
            )
+            start()
        }
        notifyAllClients()
    }
@@ -93,10 +94,14 @@ object DownloadManager {
    }

    fun start() {
+        if (downloader != null && !downloader?.isAlive!!) // doesn't exist or is dead
+            downloader = null
+
        if (downloader == null) {
            downloader = Downloader(downloadQueue) { notifyAllClients() }
            downloader!!.start()
        }
+
        notifyAllClients()
    }

@@ -35,7 +35,10 @@ class Downloader(private val downloadQueue: CopyOnWriteArrayList<DownloadChapter

    override fun run() {
        do {
-            val download = downloadQueue.firstOrNull { it.state == Queued } ?: break
+            val download = downloadQueue.firstOrNull {
+                it.state == Queued ||
+                    (it.state == Error && it.tries < 3) // 3 re-tries per download
+            } ?: break

            try {
                download.state = Downloading
@@ -44,7 +47,7 @@ class Downloader(private val downloadQueue: CopyOnWriteArrayList<DownloadChapter
                download.chapter = runBlocking { getChapter(download.chapterIndex, download.mangaId) }
                step()

-                val pageCount = download.chapter!!.pageCount!!
+                val pageCount = download.chapter!!.pageCount
                for (pageNum in 0 until pageCount) {
                    runBlocking { getPageImage(download.mangaId, download.chapterIndex, pageNum) }
                    // TODO: retry on error with 2,4,8 seconds of wait
@@ -60,12 +63,15 @@ class Downloader(private val downloadQueue: CopyOnWriteArrayList<DownloadChapter
                    }
                }
                step()
+
+                downloadQueue.removeIf { it.mangaId == download.mangaId && it.chapterIndex == download.chapterIndex }
+                step()
            } catch (e: DownloadShouldStopException) {
                println("Downloader was stopped")
                downloadQueue.filter { it.state == Downloading }.forEach { it.state = Queued }
            } catch (e: Exception) {
                println("Downloader faced an exception")
-                downloadQueue.filter { it.state == Downloading }.forEach { it.state = Error }
+                downloadQueue.filter { it.state == Downloading }.forEach { it.state = Error; it.tries++ }
                e.printStackTrace()
            } finally {
                notifier()
@@ -14,5 +14,6 @@ class DownloadChapter(
    val mangaId: Int,
    var state: DownloadState = DownloadState.Queued,
    var progress: Float = 0f,
+    var tries: Int = 0,
    var chapter: ChapterDataClass? = null,
 )