Merge pull request #84 from eternal-flame-AD/upstream

build dist; bump 7.0.11;

build/pxer-utility.js

@@ -4,7 +4,7 @@ const Babel = require('babel-core');
 
 module.exports.pxerURL ='https://pxer-app.pea3nut.org/';
 module.exports.rootPath ='../';
-module.exports.pxerVersion ='7.0.10';
+module.exports.pxerVersion ='7.0.11';
 
 module.exports.path2URL =function(path){
     var url =module.exports.pxerURL;

dist/launcher.js

@@ -6,7 +6,7 @@
 ~function () {
     var libURL = /**/"dist/lib.js"; //*/'';
     var supportURL = /**/"dist/support.js"; //*/'';
-    window['PXER_VERSION'] = /**/"7.0.10"; //*/'';
+    window['PXER_VERSION'] = /**/"7.0.11"; //*/'';
 
     Promise.resolve().then(function () {
         var script = document.createElement('script');

dist/pxer-core.js

@@ -240,6 +240,7 @@ function denyNewAttr(obj) {
         }
     });
 }
+
 'use strict';
 
 var PxerEvent = function () {
@@ -727,7 +728,7 @@ PxerHtmlParser.parseMediumHtml = function (_ref9) {
 
         pw.domain = URLObj.domain;
         pw.date = src.match(PxerHtmlParser.REGEXP['getDate'])[1];
-        pw.frames = meta['frames'];
+        pw.frames = meta['body']['frames'];
     } else {
         var _src = illustData.urls.original;
         var _URLObj = parseURL(_src);
@@ -740,7 +741,7 @@ PxerHtmlParser.parseMediumHtml = function (_ref9) {
 
 PxerHtmlParser.REGEXP = {
     'getDate': /img\/((?:\d+\/){5}\d+)/,
-    'getInitData': /(?<=\()\{token:.*\}(?=\);)/
+    'getInitData': /\{token:.*\}(?=\);)/
 };
 
 PxerHtmlParser.HTMLParser = function (aHTMLString) {
@@ -1117,6 +1118,17 @@ PxerPrinter.defaultConfig = function () {
         "ugoira_frames": "no" //[yes|no]
     };
 };
+/**作品页跳过过滤 */
+PxerPrinter.printAllConfig = function () {
+    return {
+        "manga_single": "max", //[max|600p|no]
+        "manga_multiple": "max", //[max|1200p|cover_600p|no]
+        "illust_single": "max", //[max|600p|no]
+        "illust_multiple": "max", //[max|1200p|cover_600p|no]
+        "ugoira_zip": "max", //[max|600p|no]
+        "ugoira_frames": "yes" //[yes|no]
+    };
+};
 
 /**
  * 拼装动图原始地址
@@ -1648,7 +1660,7 @@ var PxerApp = function (_PxerEvent3) {
             retry: 3,
             thread: 8
         };
-        _this9.ppConfig = PxerPrinter.defaultConfig(); //PxerPrinter
+        _this9.ppConfig = _this9.pageType.startsWith("works_") ? PxerPrinter.printAllConfig() : PxerPrinter.defaultConfig(); //PxerPrinter
         _this9.pfConfig = PxerFilter.defaultConfig(); //PxerFilter
 
         // 使用的PxerThreadManager实例

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxer",
-  "version": "7.0.10",
+  "version": "7.0.11",
   "description": "<p align=\"left\">\r \t<img alt=\"\" src=\"https://img.shields.io/badge/JavaScript-ES6-green.svg\" />\r \t<img alt=\"\" src=\"https://img.shields.io/badge/install-Greasemonkey-green.svg\" />\r \t<img alt=\"\" src=\"https://img.shields.io/badge/jQuery-No-red.svg\" />\r \t<img alt=\"\" src=\"https://img.shields.io/badge/Node.js-No-red.svg\" />\r \t<img alt=\"\" src=\"https://img.shields.io/npm/l/express.svg\" />\r </p>",
   "main": "index.js",
   "scripts": {

src/launcher.js

@@ -4,7 +4,7 @@
 ~function(){
     var libURL =/**/"src/app/lib.js";//*/'';
     var supportURL =/**/"src/app/support.js";//*/'';
-    window['PXER_VERSION'] =/**/"7.0.10";//*/'';
+    window['PXER_VERSION'] =/**/"7.0.11";//*/'';
 
     Promise.resolve().then(function(){
         var script = document.createElement('script');