fix issue

Author: leoding86

src/options_page/components/options/PixivComicOptions.vue

@@ -33,7 +33,7 @@
             <v-list-tile-sub-title>{{ tl('_page_number_start_with_1_otherwise_start_with_0') }}</v-list-tile-sub-title>
           </v-list-tile-content>
           <v-list-tile-action>
-            <v-switch v-model="pixivComicNumberStartWithOne"></v-switch>
+            <v-switch v-model="pixivComicPageNumberStartWithOne"></v-switch>
           </v-list-tile-action>
         </v-list-tile>
 
@@ -152,13 +152,13 @@ export default {
       });
     },
 
-    pageNumberStartWithOne(val) {
+    pixivComicPageNumberStartWithOne(val) {
       browser.storage.local.set({
         pixivComicPageNumberStartWithOne: val
       });
     },
 
-    pageNumberLength(val) {
+    pixivComicPageNumberLength(val) {
       browser.storage.local.set({
         pixivComicPageNumberLength: val
       });

src/pixiv_comic/content_scripts/App.vue

@@ -4,6 +4,7 @@
     :panelPosition="browserItems.downloadPanelPosition"
   >
     <ptk-button class="download-btn download-btn--min-70"
+      :class="downloaded ? 'button--success' : ''"
       @click="downloadImages"
     >{{ downloadText }}</ptk-button>
   </control-panel>
@@ -37,7 +38,8 @@ export default {
       successCount: 0,
       failCount: 0,
       downloading: false,
-      unsupportedPostType: false
+      unsupportedPostType: false,
+      downloaded: false
     }
   },
 
@@ -96,6 +98,7 @@ export default {
         this.totalCount = 0;
         this.successCount = 0;
         this.failCount = 0;
+        this.downloaded = false;
 
         this.injectPage();
       }
@@ -139,8 +142,8 @@ export default {
        */
       let episode = new Episode(this.context);
 
-      let savePath = this.browserItems.illustrationRelativeLocation ?
-            this.getSubfolder(this.browserItems.illustrationRelativeLocation, episode.context) :
+      let savePath = this.browserItems.pixivComicRelativeLocation ?
+            this.getSubfolder(this.browserItems.pixivComicRelativeLocation, episode.context) :
             this.browserItems.downloadRelativeLocation;
 
       if (this.lastData) {
@@ -155,11 +158,10 @@ export default {
         this.totalCount = episode.pagesNumber();
 
         episode.initOptions({
-          splitSize: 99,
-          illustrationRenameFormat: vm.getItem('illustrationRenameFormat'),
-          illustrationImageRenameFormat: vm.getItem('illustrationImageRenameFormat'),
-          pageNumberStartWithOne: vm.getItem('illustrationPageNumberStartWithOne'),
-          illustrationPageNumberLength: 0,
+          renameFormat: vm.getItem('pixivComicRenameFormat'),
+          imageRenameFormat: vm.getItem('pixivComicImageRenameFormat'),
+          pageNumberStartWithOne: vm.getItem('pixivComicPageNumberStartWithOne'),
+          pageNumberLength: vm.getItem('pixivComicPageNumberLength'),
         }).init();
 
         episode.addListener('download-progress', progress => {
@@ -176,16 +178,21 @@ export default {
         }
 
         episode.downloadFiles({ indexes }, episode).then(files => {
-          episode.getPackedFile({ files }).then(result => {
-            this.lastData = result.data;
-            this.lastFilename = result.filename;
-
-            this.downloadFile({
-              src: result.data,
-              filename: result.filename,
-              folder: savePath,
+          if (vm.getItem('downloadPackFiles') == false) {
+            this.downloadMultipleFiles(files, { savePath })
+                .then(() => this.downloaded = true);
+          } else {
+            episode.getPackedFile({ files }).then(result => {
+              this.lastData = result.data;
+              this.lastFilename = result.filename;
+
+              this.downloadFile({
+                src: result.data,
+                filename: result.filename,
+                folder: savePath,
+              }).then(() => this.downloaded = true);
             });
-          });
+          }
         }).finally(() => {
           this.downloading = false;
         });

src/pixiv_comic/modules/Episode.js

@@ -29,19 +29,19 @@ class Episode extends FilesDownloader {
   }
 
   initOptions({
-    splitSize,
-    illustrationRenameFormat,
-    illustrationImageRenameFormat,
+    splitSize = 1000,
+    renameFormat,
+    imageRenameFormat,
     pageNumberStartWithOne = false,
-    illustrationPageNumberLength,
+    pageNumberLength,
     processors = 2,
     pack = true
   }) {
     this.splitSize = splitSize;
-    this.illustrationRenameFormat = illustrationRenameFormat
-    this.illustrationImageRenameFormat = illustrationImageRenameFormat;
+    this.renameFormat = renameFormat
+    this.imageRenameFormat = imageRenameFormat;
     this.pageNumberStartWithOne = pageNumberStartWithOne;
-    this.illustrationPageNumberLength = illustrationPageNumberLength;
+    this.pageNumberLength = pageNumberLength;
     this.processors = processors;
     this.pack = pack;
     this.relativePath = '';
@@ -53,7 +53,7 @@ class Episode extends FilesDownloader {
   }
 
   init() {
-    this.relativePath = formatName(this.illustrationRenameFormat, this.context, this.context.illustId);
+    this.relativePath = formatName(this.renameFormat, this.context, this.getId());
     this.chunks = [];
     this.filename = null;
     this.zips = null;
@@ -78,10 +78,10 @@ class Episode extends FilesDownloader {
       startIndex = chunk.end + 1;
     }
 
-    if (!self.illustrationImageRenameFormat ||
-        self.illustrationImageRenameFormat.indexOf('{pageNum}') < 0
+    if (!self.imageRenameFormat ||
+        self.imageRenameFormat.indexOf('{pageNum}') < 0
     ) {
-      self.illustrationImageRenameFormat += '{pageNum}';
+      self.imageRenameFormat += '{pageNum}';
     }
   }
 
@@ -94,32 +94,28 @@ class Episode extends FilesDownloader {
     this.context[key] = value;
   }
 
-  getUserId() {
-    return this.context.userId
-  }
-
-  getUserName() {
-    return this.context.userName
+  getId() {
+    return this.context.id
   }
 
-  getId() {
-    return this.context.illustId
+  getUniqueId() {
+    return `pixiv-comic-episode:${this.getId()}`;
   }
 
   getImages() {
-    return this.context.urls
+    return this.context.pages
   }
 
   getThumb() {
-    return this.getImages().thumb;
+    return this.getImages()[0];
   }
 
   getTitle() {
-    return this.context.illustTitle
+    return this.context.title;
   }
 
   isR() {
-    return !!this.context.r
+    return false;
   }
 
   /**
@@ -128,7 +124,7 @@ class Episode extends FilesDownloader {
    * @returns {Boolean}
    */
   isSingle() {
-    return this.pagesNumber() === 1
+    return false;
   }
 
   /**
@@ -168,11 +164,11 @@ class Episode extends FilesDownloader {
     let pageNum = index + (this.pageNumberStartWithOne ? 1 : 0);
 
     this.context.pageNum = this.getPageNumberString(
-      pageNum, this.context.pages.length, this.illustrationPageNumberLength
+      pageNum, this.context.pages.length, this.pageNumberLength
     );
 
     return formatName(
-      this.illustrationImageRenameFormat.replace(this.isSingle() ? /#.*#/g: /#/g, ''),
+      this.imageRenameFormat.replace(this.isSingle() ? /#.*#/g: /#/g, ''),
       this.context,
       pageNum
     );
@@ -183,7 +179,7 @@ class Episode extends FilesDownloader {
    * @returns {string}
    */
   getPackedFilename() {
-    return formatName(this.illustrationRenameFormat, this.context, this.context.illustId);
+    return formatName(this.renameFormat, this.context, this.getId());
   }
 
   /**
@@ -214,7 +210,7 @@ class Episode extends FilesDownloader {
 
           this.context.pageNum = pageNum;
 
-          let format = this.illustrationImageRenameFormat.replace(/#.*#/g, '');
+          let format = this.imageRenameFormat.replace(/#.*#/g, '');
 
           let filename = formatName(format, this.context, pageNum) + '.' + MimeType.getExtenstion(download.getResponseHeader('Content-Type'));