Merge pull request #111 from eternal-flame-AD/build

prepare for build dist
pea3nut · Aug 5, 2018 · 98825ed · 98825ed
2 parents 0248b38 + 05cf46e
commit 98825ed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/app/class/PxerHtmlParser.class.js b/src/app/class/PxerHtmlParser.class.js
@@ -92,14 +92,15 @@ PxerHtmlParser.parsePage = function (task) {
             };
             break;
         case "bookmark_new":
-            var data = JSON.parse(task.html);
-            for (var task of data['contents']) {
+            var dom = PxerHtmlParser.HTMLParser(task.html);
+            var data = JSON.parse(dom.body.querySelector("div#js-mount-point-latest-following").getAttribute("data-items"));
+            for (var task of data) {
 
                 var task = new PxerWorksRequest({
                     html      : {},
-                    type      : this.parseIllustType(task['illust_type']),
-                    isMultiple: task['illust_page_count'] > 1,
-                    id        : task['illust_id'].toString(),
+                    type      : this.parseIllustType(task.illustType),
+                    isMultiple: task.pageCount > 1,
+                    id        : task.illustId.toString(),
                 });
                 task.url = PxerHtmlParser.getUrlList(task);
 

diff --git a/src/app/class/PxerPrinter.class.js b/src/app/class/PxerPrinter.class.js
@@ -200,7 +200,7 @@ PxerPrinter.prototype['generateUgoiraScript'] =function(frames) {
         lines.push("{ hash ffmpeg 2>/dev/null && ffmpeg=ffmpeg;} || { [ -x ./ffmpeg ] && ffmpeg=./ffmpeg;} || { echo >&2 \"Failed to locate ffmpeg executable. Aborting.\"; exit 1;}");
         lines.push("read -p '请输入输出文件扩展名(mp4/gif/...):' ext");
     }
-    for (key in frames) {
+    for (let key in frames) {
         var foldername = key + "_ugoira" + resstring;
         var confpath = foldername + "/config.txt";
         var height = frames[key].height;
@@ -211,7 +211,7 @@ PxerPrinter.prototype['generateUgoiraScript'] =function(frames) {
             width = parseInt(width/scale);
         }
         lines.push(isWindows?("del "+ foldername + "\\config.txt >nul 2>nul"):("rm "+ foldername + "/config.txt &> /dev/null"));
-        for (frame of frames[key].framedef) {
+        for (let frame of frames[key].framedef) {
             lines.push("echo file "+slashstr+"'" + frame['file']+ slashstr +"' >> "+confpath);
             lines.push("echo duration " + frame['delay']/1000 + " >> "+ confpath);
         }

diff --git a/src/view/vm.js b/src/view/vm.js
@@ -228,7 +228,7 @@ afterLoad(function(){
             printWorks(){
                 this.pxer.printWorks();
                 var sanitizedpfConfig = {};
-                for (key in this.pxer.pfConfig) {
+                for (let key in this.pxer.pfConfig) {
                     sanitizedpfConfig[key] = this.pxer.pfConfig[key].length?this.pxer.pfConfig[key].length:this.pxer.pfConfig[key];
                 }
                 this.analytics.postData("pxer.app.print", {