fixed #256, added one zip mulitple images option for controlling zipping

leoding86 · Aug 16, 2024 · 9fad186 · 9fad186
1 parent 52133a4
commit 9fad186
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/options_page/components/options/GlobalTaskSettings.vue b/src/options_page/components/options/GlobalTaskSettings.vue
@@ -122,6 +122,9 @@ export default {
       }, {
         text: this.tl('_disable'),
         value: 0
+      }, {
+        text: this.tl('_disable_there_is_only_one_image'),
+        value: 2
       }]
     },
 

diff --git a/src/options_page/modules/DownloadTasks/MultiplePagesDownloadTask.js b/src/options_page/modules/DownloadTasks/MultiplePagesDownloadTask.js
@@ -129,6 +129,10 @@ class MultipleDownloadTask extends AbstractDownloadTask {
     this.dispatch('progress', [this.progress]);
   }
 
+  shouldZipFile() {
+    return this.zipMultipleImages === 1 || (this.zipMultipleImages === 2 && this.options.pages.length > 1);
+  }
+
   /**
    *
    * @param {*} param0
@@ -141,7 +145,7 @@ class MultipleDownloadTask extends AbstractDownloadTask {
       context: Object.assign({}, this.context, { pageNum })
     });
 
-    if (this.zipMultipleImages === 1) {
+    if (this.shouldZipFile()) {
       const now = new Date();
       now.setMinutes(now.getMinutes() - now.getTimezoneOffset());
       const file = nameFormatter.format(this.options.renameImageRule, `p${pageNum}`) + `.${MimeType.getExtenstion(mimeType)}`;
@@ -184,7 +188,7 @@ class MultipleDownloadTask extends AbstractDownloadTask {
    * @fires MultipleDownloadTask#complete
    */
   onFinish() {
-    if (this.zipMultipleImages === 1) {
+    if (this.shouldZipFile()) {
       const nameFormatter = NameFormattor.getFormatter({ context: Object.assign({}, this.context) });
       let filename = pathjoin(GlobalSettings().downloadRelativeLocation, nameFormatter.format(this.options.renameRule, this.context.id));
       filename = fixFilename(filename);