Merge branch 'feature'

Author: leoding86

config/webpack.background.config.js

@@ -58,12 +58,22 @@ module.exports = env => {
 
               json.version_name = json.version = packageInfo.version;
 
+              /**
+               * About manifest file, there are some differences between FireFox and browsers which based Chromium.
+               * So we need do some extra works to make the target browser manifest file.
+               */
               if (json.options_page && platform === 'firefox') {
                 console.log(`rename options_page to options_ui`);
 
                 json.options_ui = {};
                 json.options_ui.page = json.options_page;
                 json.options_ui.open_in_tab = true;
+
+                json.optional_permissions.forEach(permission => {
+                  json.permissions.push(permission);
+                });
+
+                delete json.optional_permissions;
                 delete json.options_page;
 
                 console.log(`remove version_name property from manifest`);

package.json

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

src/config/default.js

@@ -191,4 +191,14 @@ export default Object.assign({}, {
     downloadPackFiles: true,
     ugoiraConvertTool: 'default',
     ugoiraCustomFFmpegCommand: '',
+
+    /**
+     * @since 5.1.0
+     */
+    illustrationCreateSubdirectory: true,
+
+    /**
+     * @since 5.2.0
+     */
+    disableDownloadsShelf: false,
   });

src/content_scripts/Browser/downloads.js

@@ -1,6 +1,18 @@
 import Browser from '@/modules/Browser/Browser';
 
+/**
+ * @typedef DownloadOptions
+ * @property {ArrayBuffer} arrayBuffer
+ * @property {string} url
+ * @property {boolean} saveAs
+ * @property {string} filename
+ */
 export default {
+  /**
+   *
+   * @param {DownloadOptions} options
+   * @returns
+   */
   download(options) {
     return new Promise(function (resolve, reject) {
       let browser = Browser.getBrowser();

src/content_scripts/FilesDownloader.js

@@ -150,9 +150,9 @@ class FilesDownloader extends Event {
         });
       });
 
-      zip.generateAsync({ type: 'blob' }).then(blob => {
+      zip.generateAsync({ type: 'arraybuffer' }).then(ab => {
         resolve({
-          data: blob,
+          data: ab,
           filename: ((typeof getFilenameFunc == 'function') ? getFilenameFunc() : this.getPackedFilename()) + '.zip'
         });
       }).catch(error => {

src/content_scripts/components/Illust.vue

@@ -97,6 +97,10 @@ export default {
     }
   },
 
+  created() {
+    this.createSubdirectory = this.browserItems.illustrationCreateSubdirectory;
+  },
+
   mounted() {
     /**
      * @var {IllustTool}
@@ -229,6 +233,27 @@ export default {
       }
     },
 
+    /**
+     * Download multiple files
+     *
+     * @param {Object[]} files
+     * @param {{savePath: string}} options
+     * @param {number} [index=0]
+     * @returns {Promise}
+     */
+    downloadMultipleFiles(files, { savePath }, index = 0) {
+      let file = files[index];
+
+      if (!file) {
+        return Promise.resolve();
+      }
+
+      return this.downloadFile({
+        src: file.data, filename: file.filename, folder: savePath
+      })
+      .then(() => this.downloadMultipleFiles(files, { savePath }, index + 1));
+    },
+
     /**
      * Download multiple files. The browser will popup a confirm dialog for user
      * for asking user if he/she agree to download multiple files from the website.
@@ -251,32 +276,29 @@ export default {
       }
 
       if ((files.length === 1 && this.alwaysPack) || (files.length > 1 && this.packFiles)) {
-        this.tool.getPackedFile({files}).then(file => {
+        this.tool.getPackedFile({files}).then(result => {
           /**
            * Download zip file
            */
-          this.downloadFile(file.data, file.filename, {
-            folder: savePath,
-            statType: 'illust'
-          });
+          this.downloadFile({
+            src: result.data,
+            filename: result.filename,
+            folder: savePath
+          })
+          .then(() => this.updateDownloadStat('illust'));
         });
       } else {
-        savePath = pathjoin(savePath, this.tool.relativePath, '/');
+        if (this.createSubdirectory) {
+          savePath = pathjoin(savePath, this.tool.relativePath, '/');
+        } else {
+          savePath = pathjoin(savePath, '/');
+        }
 
         /**
          * Cache files and change button type
          */
-
-        files.forEach(file => {
-          this.downloadFile(
-            new Blob([file.data], { type: file.mimeType }),
-            file.filename,
-            {
-              folder: savePath,
-              statType: 'illust'
-            }
-          );
-        });
+        this.downloadMultipleFiles(files, { savePath })
+        .then(() => this.updateDownloadStat('illust'));
       }
 
       this.saveDownloadRecord({ illust: 1 });

src/content_scripts/components/Manga.vue

@@ -159,6 +159,27 @@ export default {
       this.$set(this.buttonsInfo, buttonInfo.index, Object.assign(buttonInfo, data));
     },
 
+    /**
+     * Download multiple files
+     *
+     * @param {Object[]} files
+     * @param {{savePath: string}} options
+     * @param {number} [index=0]
+     * @returns {Promise}
+     */
+    downloadMultipleFiles(files, { savePath }, index = 0) {
+      let file = files[index];
+
+      if (!file) {
+        return Promise.resolve();
+      }
+
+      return this.downloadFile({
+        src: file.data, filename: file.filename, folder: savePath
+      })
+      .then(() => this.downloadMultipleFiles(files, { savePath }, index + 1));
+    },
+
     /**
      * Download multiple files. The browser will popup a confirm dialog for user
      * for asking user if he/she agree to download multiple files from the website.
@@ -186,28 +207,21 @@ export default {
           /**
            * Download zip file
            */
-          this.downloadFile(file.data, file.filename, {
+          this.downloadFile({
+            src: file.data,
+            filename: file.filename,
             folder: savePath,
-            statType: 'manga'
-          });
+          })
+          .then(() => this.updateDownloadStat('manga'));
         });
       } else {
         savePath = pathjoin(savePath, this.tool.relativePath, '/');
 
         /**
          * Cache files and change button type
          */
-
-        files.forEach(file => {
-          this.downloadFile(
-            new Blob([file.data], { type: file.mimeType }),
-            file.filename,
-            {
-              folder: savePath,
-              statType: 'manga'
-            }
-          );
-        });
+        this.downloadMultipleFiles(files, { savePath })
+        .then(() => this.updateDownloadStat('manga'));
       }
 
       this.saveDownloadRecord({ manga: 1 });

src/content_scripts/components/Novel.vue

@@ -156,10 +156,12 @@ export default {
           this.getSubfolder(this.browserItems.novelRelativeLocation, this.tool.context) :
           this.browserItems.downloadRelativeLocation;
 
-        this.downloadFile(blob, this.getFilename(type), {
+        this.downloadFile({
+          src: blob,
+          filename: this.getFilename(type),
           folder: savePath,
-          statType: 'novel'
-        });
+        })
+        .then(() => this.updateDownloadStat('novel'));
 
         let record = {};
 

src/content_scripts/components/Ugoira.vue

@@ -181,10 +181,12 @@ export default {
 
         let savePath = this.getSavePath();
 
-        this.downloadFile(this.tool.zipBlob, this.getFilename() + '.zip', {
+        this.downloadFile({
+          src: this.tool.zipBlob,
+          filename: this.getFilename() + '.zip',
           folder: savePath,
-          statType: 'ugoira',
-        });
+        })
+        .then(() => this.updateDownloadStat('ugoira'));
 
         this.saveDownloadRecord({
           zip: 1
@@ -197,10 +199,12 @@ export default {
     saveFile(button, blob, type) {
       let savePath = this.getSavePath();
 
-      this.downloadFile(blob, this.getFilename() + '.' + button.extName, {
+      this.downloadFile({
+        src: blob,
+        filename: this.getFilename() + '.' + button.extName,
         folder: savePath,
-        statType: 'ugoira'
-      });
+      })
+      .then(() => this.updateDownloadStat('ugoira'));
 
       let data = {};
       data[type] = 1;