Merge branch 'master' of github.com:leoding86/webextension-pixiv-toolkit

Author: leoding86

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pixiv-toolkits",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "A web extension for adding features on Pixiv and more",
   "author": "leoding86 <leoding86@msn.com>",
   "private": false,

src/background/services/DownloadService.js

@@ -2,7 +2,7 @@
  * @Author: Leo Ding <leoding86@msn.com>
  * @Date: 2024-08-11 11:09:14
  * @LastEditors: Leo Ding <leoding86@msn.com>
- * @LastEditTime: 2024-08-21 19:54:16
+ * @LastEditTime: 2024-09-22 13:13:08
  * @FilePath: \webextension-pixiv-toolkit\src\background\services\DownloadService.js
  */
 import browser from "@/modules/Extension/browser";
@@ -24,6 +24,12 @@ class DownloadService extends AbstractService {
 
   constructor() {
     super();
+    this.listenOnDeterminingFilename();
+  }
+
+  listenOnDeterminingFilename() {
+    if (DownloadService.onDeterminingFilenameListenered === true) return;
+    DownloadService.onDeterminingFilenameListenered = true;
 
     browser.downloads.onDeterminingFilename.addListener((downloadItem, suggest) => {
       const filenameSuggestion = {
@@ -37,8 +43,6 @@ class DownloadService extends AbstractService {
         filenameSuggestion.filename = downloadItem.filename;
       }
 
-      console.log(downloadItem, filenameSuggestion);
-
       suggest(filenameSuggestion);
     });
   }
@@ -133,4 +137,9 @@ class DownloadService extends AbstractService {
   }
 }
 
+/**
+ * @type {boolean} Prevent listen the event multiple times
+ */
+DownloadService.onDeterminingFilenameListenered = false;
+
 export default DownloadService;

src/background/updates/update6_0_0.js

@@ -2,7 +2,7 @@
  * @Author: Leo Ding <leoding86@msn.com>
  * @Date: 2024-08-21 13:26:02
  * @LastEditors: Leo Ding <leoding86@msn.com>
- * @LastEditTime: 2024-09-08 14:12:23
+ * @LastEditTime: 2024-09-22 11:24:09
  * @FilePath: \webextension-pixiv-toolkit\src\background\updates\update6_0_0.js
  */
 import { app } from "../Application";
@@ -15,7 +15,7 @@ import defaultSettings from "@/config/default";
 export default async () => {
   let settings = await app().getService('setting').getSettings();
   let updateSettings = Object.assign({}, defaultSettings, settings, {
-    version: '6.4.1',
+    version: '6.4.2',
   });
 
   /**

src/modules/GlobalSettings.js

@@ -3,6 +3,7 @@
  * @property {number} downloadSaveMode
  * @property {number} globalZipMultipleImages
  * @property {number} downloadSaveMode
+ * @property {boolean} enableDownloadMetadata
  *
  * @param {*} fallback
  * @returns {GlobalSettings}

src/options_page/modules/DownloadTasks/MultiplePagesDownloadTask.js

@@ -197,10 +197,50 @@ class MultipleDownloadTask extends AbstractDownloadTask {
     this.dispatch('progress', [this.progress]);
   }
 
+  /**
+   * Override in download task
+   * @returns {boolean}
+   */
+  canSaveInfo() {
+    return false;
+  }
+
+  async saveInfo() {
+    const metaFilename = 'info.json';
+    const that = this;
+
+    return new Promise(async resolve => {
+      const blob = new Blob([JSON.stringify(that.options.context)], {
+        type: 'application/json'
+      });
+
+      if (that.shouldZipFile()) {
+        that.zip.file(metaFilename, blob, { date: this.now });
+      } else {
+        await browser.runtime.sendMessage({
+          to: 'ws',
+          action: 'download:saveFile',
+          args: {
+            url: URL.createObjectURL(blob),
+            filename: metaFilename
+          }
+        })
+      }
+      resolve();
+    });
+  }
+
   /**
    * @fires MultipleDownloadTask#complete
    */
-  onFinish() {
+  async onFinish() {
+    if (GlobalSettings().enableDownloadMetadata &&
+      this.options.context &&
+      this.canSaveInfo()
+    ) {
+      await this.saveInfo();
+    }
+
     if (this.shouldZipFile()) {
       const nameFormatter = NameFormattor.getFormatter({ context: Object.assign({}, this.context) });
       let filename = pathjoin(

src/options_page/modules/DownloadTasks/Pixiv/IllustDownloadTask.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: Leo Ding <leoding86@msn.com>
+ * @Date: 2024-08-01 01:14:07
+ * @LastEditors: Leo Ding <leoding86@msn.com>
+ * @LastEditTime: 2024-09-22 13:05:04
+ * @FilePath: \webextension-pixiv-toolkit\src\options_page\modules\DownloadTasks\Pixiv\IllustDownloadTask.js
+ */
 import MultipleDownloadTask from "../MultiplePagesDownloadTask";
 
 /**
@@ -25,6 +32,14 @@ class IllustDownloadTask extends MultipleDownloadTask {
   static create(options) {
     return new IllustDownloadTask(options);
   }
+
+  /**
+   * @override
+   * @returns {true}
+   */
+  canSaveInfo() {
+    return true;
+  }
 }
 
 export default IllustDownloadTask;

src/options_page/modules/DownloadTasks/Pixiv/MangaDownloadTask.js

@@ -25,6 +25,14 @@ class MangaDownloadTask extends MultipleDownloadTask {
   static create(options) {
     return new MangaDownloadTask(options);
   }
+
+  /**
+   * @override
+   * @returns {true}
+   */
+  canSaveInfo() {
+    return true;
+  }
 }
 
 export default MangaDownloadTask;

src/options_page/modules/DownloadTasks/Pixiv/UgoiraDownloadTask.js

@@ -186,6 +186,20 @@ class UgoiraDownloadTask extends AbstractDownloadTask {
     URL.revokeObjectURL(url);
 
     this.dispatch('progress', [this.progress]);
+
+    /**
+     * Save work information accroding the enableDownloadMetadata setting
+     */
+    if (GlobalSettings().enableDownloadMetadata && this.options.context) {
+      const blob = new Blob([JSON.stringify(this.options.context)], { type: 'application/json' });
+      await browser.runtime.sendMessage({
+        to: 'ws', action: 'download:saveFile',
+        args: {
+          url: URL.createObjectURL(blob),
+          filename: 'info.json'
+        }
+      });
+    }
   }
 
   /**