5.2.6 新增下一页链接匹配 @include

lgmxiii · Oct 29, 2015 · 392632d · 392632d
1 parent 033890f
commit 392632d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 4 deletions.
diff --git a/MyNovelReader/MyNovelReader.user.js b/MyNovelReader/MyNovelReader.user.js
@@ -3,7 +3,7 @@
 // @name           My Novel Reader
 // @name:zh-CN     小说阅读脚本
 // @name:zh-TW     小說閱讀腳本
-// @version        5.2.5
+// @version        5.2.6
 // @namespace      https://github.com/ywzhaiqi
 // @author         ywzhaiqi
 // @contributor    Roger Au, shyangs, JixunMoe、akiba9527 及其他网友
@@ -19,6 +19,7 @@
 // @grant          GM_openInTab
 // @grant          GM_setClipboard
 // @grant          GM_registerMenuCommand
+// @grant          GM_info
 // @grant          unsafeWindow
 // @homepageURL    https://greasyfork.org/scripts/292/
 // @require        http://cdn.staticfile.org/jquery/2.1.1/jquery.min.js
@@ -280,6 +281,7 @@
 // @include        http://www.77nt.com/*/*.html
 // @include        http://www.quanbenba.com/yuedu/*/*/*.html
 // @include        http://*.sto.cc/*-*/
+// @include        http://www.151xs.com/wuxiazuoxiong/*/chapter/*/
 
 // @exclude        */List.htm
 // @exclude        */List.html
@@ -2021,7 +2023,7 @@ Rule.replaceAll = [
     '[《〈》>\\+｜～［\\]]无\\1错\\1', '》无>错》',
 
     '女凤免费小说抢先看', '女凤小说网全文字 无广告',
-    '乐文小说', '《乐〈文《小说', '乐文移动网', '頂点小说', '頂點小說',
+    '乐文小说网?', '《乐〈文《小说', '乐文移动网', '頂点小说', '頂點小說',
     '追小说哪里快去眼快',
     '\\[书库\\].\\[774\\]\\[buy\\].kuai',
 
@@ -3760,6 +3762,11 @@ Parser.prototype = {
             }
         }
 
+        // 跟 include 比较
+        var includeUrl = this.info.includeUrl || this.getIncludeUrl();
+        if (!toRE(includeUrl).test(url))
+            return false;
+
         switch(true){
             case url === '':
             case Rule.nextUrlIgnore.some(function(re) { return toRE(re).test(url) }):
@@ -3772,6 +3779,23 @@ Parser.prototype = {
                 return true;
         }
     },
+    getIncludeUrl: function() {
+        var includeUrl = this.info.url;
+
+        if (!includeUrl && typeof GM_info !== 'undefined') {
+            var locationHref = location.href;
+            GM_info.script.includes.some(function(includeStr) {
+                var iUrl = wildcardToRegExpStr(includeStr);
+                if (toRE(iUrl).test(locationHref)) {
+                    includeUrl = iUrl;
+                    return true;
+                }
+            });
+        }
+
+        this.info.includeUrl = includeUrl;
+        return includeUrl;
+    },
     checkLinks: function(links){
         var self = this;
         if (_.isString(links)) {

diff --git a/MyNovelReader/package.json b/MyNovelReader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MyNovelReader",
-  "version": "5.2.5",
+  "version": "5.2.6",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-jshint": "~0.10.0",

diff --git a/MyNovelReader/src/meta.js b/MyNovelReader/src/meta.js
@@ -19,6 +19,7 @@
 // @grant          GM_openInTab
 // @grant          GM_setClipboard
 // @grant          GM_registerMenuCommand
+// @grant          GM_info
 // @grant          unsafeWindow
 // @homepageURL    https://greasyfork.org/scripts/292/
 // @require        http://cdn.staticfile.org/jquery/2.1.1/jquery.min.js
@@ -280,6 +281,7 @@
 // @include        http://www.77nt.com/*/*.html
 // @include        http://www.quanbenba.com/yuedu/*/*/*.html
 // @include        http://*.sto.cc/*-*/
+// @include        http://www.151xs.com/wuxiazuoxiong/*/chapter/*/
 
 // @exclude        */List.htm
 // @exclude        */List.html

diff --git a/MyNovelReader/src/parser.js b/MyNovelReader/src/parser.js
@@ -721,6 +721,11 @@ Parser.prototype = {
             }
         }
 
+        // 跟 include 比较
+        var includeUrl = this.info.includeUrl || this.getIncludeUrl();
+        if (!toRE(includeUrl).test(url))
+            return false;
+
         switch(true){
             case url === '':
             case Rule.nextUrlIgnore.some(function(re) { return toRE(re).test(url) }):
@@ -733,6 +738,23 @@ Parser.prototype = {
                 return true;
         }
     },
+    getIncludeUrl: function() {
+        var includeUrl = this.info.url;
+
+        if (!includeUrl && typeof GM_info !== 'undefined') {
+            var locationHref = location.href;
+            GM_info.script.includes.some(function(includeStr) {
+                var iUrl = wildcardToRegExpStr(includeStr);
+                if (toRE(iUrl).test(locationHref)) {
+                    includeUrl = iUrl;
+                    return true;
+                }
+            });
+        }
+
+        this.info.includeUrl = includeUrl;
+        return includeUrl;
+    },
     checkLinks: function(links){
         var self = this;
         if (_.isString(links)) {

diff --git a/MyNovelReader/src/rule.js b/MyNovelReader/src/rule.js
@@ -1709,7 +1709,7 @@ Rule.replaceAll = [
     '[《〈》>\\+｜～［\\]]无\\1错\\1', '》无>错》',
 
     '女凤免费小说抢先看', '女凤小说网全文字 无广告',
-    '乐文小说', '《乐〈文《小说', '乐文移动网', '頂点小说', '頂點小說',
+    '乐文小说网?', '《乐〈文《小说', '乐文移动网', '頂点小说', '頂點小說',
     '追小说哪里快去眼快',
     '\\[书库\\].\\[774\\]\\[buy\\].kuai',