From e1d90cc5f51bb0e4c2e5507886e60b37c4b17523 Mon Sep 17 00:00:00 2001
From: Daniel Bulant <danbulant@gmail.com>
Date: Tue, 25 May 2021 18:03:43 +0200
Subject: [PATCH] multi downloads progress bars

---
 src/components/chapter.svelte  |  7 ++++++-
 src/pages/[manga]/index.svelte | 35 +++++++++++++++++++++++++---------
 src/util/baseGenerator.js      |  2 +-
 src/util/generateCbz.js        |  2 +-
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/components/chapter.svelte b/src/components/chapter.svelte
index 3c1cf5d..bc176e3 100644
--- a/src/components/chapter.svelte
+++ b/src/components/chapter.svelte
@@ -6,9 +6,12 @@
     export var chapter;
     export var selected;
     export var disabledDownload = false;
+    export var progress = 0;
+
+    $: if(progress !== 0) console.log("chapter", chapter.data.attributes.chapter, progress * 100);
 </script>
 
-<tr on:click={() => dispatch("select")} class:selected={selected}>
+<tr on:click={() => dispatch("select")} class:selected={selected} style="background-image: linear-gradient(to right, rgba(0, 255, 0, 0.247) {progress * 100}%, transparent {progress * 100}%)">
     <td class="no-wrap">{chapter.data.attributes.volume ? "Vol " + chapter.data.attributes.volume : ""}</td>
     <td class="no-wrap">Chapter {chapter.data.attributes.chapter}</td>
     <td>{chapter.data.attributes.title}</td>
@@ -19,6 +22,8 @@
 <style>
     tr {
         border: 1px solid black;
+        position: relative;
+        transition: background-image 0.3s;
     }
 
     tr.selected {
diff --git a/src/pages/[manga]/index.svelte b/src/pages/[manga]/index.svelte
index d01312a..24840bd 100644
--- a/src/pages/[manga]/index.svelte
+++ b/src/pages/[manga]/index.svelte
@@ -3,9 +3,8 @@
     import Chapter from "../../components/chapter.svelte";
     import { EpubGenerator } from "../../util/generateEpub";
     import { CBZGenerator } from "../../util/generateCbz";
-    // import * as streamSaver from "streamsaver";
-
     import request from "../../util/request";
+    import { BaseGenerator } from "../../util/baseGenerator";
 
     export var scoped;
 
@@ -17,7 +16,7 @@
     $: relationships = scoped.mangaRelationships;
 
     async function getMangaChapters(id) {
-        const data = await request("manga/" + id + "/feed?translatedLanguage[]=en");
+        const data = await request("manga/" + id + "/feed?limit=500&translatedLanguage[]=en");
         data.results.sort((a, b) => a.data.attributes.chapter - b.data.attributes.chapter);
         return data;
     }
@@ -39,19 +38,37 @@
     $: if(totalPages) text = `Saving page ${pagesDone + 1} of ${totalPages}`;
 
     /**
-     * @type {EpubGenerator[]}
+     * @type {BaseGenerator[]}
      */
     var queue = [];
+    /**
+     * @type {BaseGenerator}
+     */
     var processing = null;
+    /**
+     * @type {Map<string, number>}
+     */
+    var progressMap = new Map();
     async function processQueue() {
         if(processing) return;
         processing = queue.shift();
         if(!processing) return processing = null;
-        processing.opts.callback = (chapter, link, finished) => {
+        state = "active";
+        processing.opts.callback = async (chapter, link, finished) => {
             console.log(chapter, link, finished);
+            var cs = await chapters;
+            var related = cs.results.filter(t => processing.opts.chapters.find(c => t.data.id === c.id));
+            var done = processing.opts.chapters.filter(t => t.number < chapter);
+            var linkCount = related.map(t => t.data.attributes[quality].length).reduce((a, b) => a + b);
+            progress = (done.reduce((a, b) => (a.links || []).length + (b.links || []).length, 0) + link + 1) / linkCount;
+            progressMap.set(processing.opts.chapters[chapter].number, link + 1);
+            progressMap = progressMap;
         };
         await processing.generate();
         processing = null;
+        progressMap = new Map();
+        progress = 0;
+        state = "idle";
         processQueue();
     }
 
@@ -184,7 +201,7 @@
             <option value="cbz"><b>.cbz</b> Comic Book Zip</option>
             <option value="epub"><b>.epub</b> Electronic publication</option>
         </select>
-        <button disabled={!!progress && selected.length} on:click={downloadMulti}>Download</button>
+        <button disabled={!selected.length} on:click={downloadMulti}>Download</button>
     </div>
 
     <p>
@@ -196,13 +213,13 @@
     {#await chapters}
         Loading chapters...
     {:then chapters}
-        {#if chapters.results.filter(c => c.data.attributes.translatedLanguage === "en").length === 0}
+        {#if chapters.results.length === 0}
             <p>No chapters found.</p>
         {/if}
         <table>
             <tbody>
-                {#each chapters.results.filter(c => c.data.attributes.translatedLanguage === "en") as chapter} 
-                    <Chapter {chapter} disabledDownload={!!progress} selected={selected.includes(chapter)} on:select={() => select(chapter)} on:download={() => downloadSingle(chapter)} />
+                {#each chapters.results as chapter, i} 
+                    <Chapter progress={(progressMap.get(chapter.data.attributes.chapter) || 0) / chapter.data.attributes[quality].length} {chapter} disabledDownload={!!progress} selected={selected.includes(chapter)} on:select={() => select(chapter)} on:download={() => downloadSingle(chapter)} />
                 {/each}
             </tbody>
         </table>
diff --git a/src/util/baseGenerator.js b/src/util/baseGenerator.js
index 8c2dbab..168d635 100644
--- a/src/util/baseGenerator.js
+++ b/src/util/baseGenerator.js
@@ -67,7 +67,7 @@ export class BaseGenerator {
      */
     callback(chapter = -1, link = -1, finished = false) {
         if(this.opts.callback) {
-            this.opts.callback(chapter, link, finished);
+            this.opts.callback(chapter, parseInt(link), finished);
         }
     }
 }
\ No newline at end of file
diff --git a/src/util/generateCbz.js b/src/util/generateCbz.js
index bd94d23..f350f48 100644
--- a/src/util/generateCbz.js
+++ b/src/util/generateCbz.js
@@ -22,7 +22,7 @@ export class CBZGenerator extends BaseGenerator {
 
         this.hashes = this.opts.chapters.map(t => t.links).flat();
 
-        const chapterCountLength = this.opts.chapters.reduce((a, b) => Math.max(a.number, b.number)).number.toString().length;
+        const chapterCountLength = this.opts.chapters.reduce((a, b) => Math.max(a.number, b.number), 0).toString().length;
         for(const chapterI in this.opts.chapters) {
             const chapter = this.opts.chapters[chapterI];
             const baseUrl = await this.getBaseURL(chapter.id);