Merge pull request #371 from Celeter/master

合并FanchangWang的pr以及修改书源调试

.github/workflows/legado.yml

@@ -6,11 +6,11 @@ on:
   push:
     branches: 
       - master
-    tags:
+#    tags:
-      - '3.*'
+#      - '3.*'
-  pull_request:
+#  pull_request:
-    branches: 
+#    branches:
-      - master
+#      - master
 #  watch:
 #    types: [started]
 #  schedule:

README.md

@@ -3,8 +3,8 @@
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 
 ## 阅读3.0
-* 书源规则 https://celeter.github.io
+* [书源规则](https://alanskycn.gitee.io/teachme/)
-* 更新日志 [updateLog.md](/app/src/main/assets/updateLog.md)
+* [更新日志](/app/src/main/assets/updateLog.md)
 
 ![image](https://github.com/gedoor/gedoor.github.io/blob/master/images/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B1.jpg)
 ![image](https://github.com/gedoor/gedoor.github.io/blob/master/images/%E9%98%85%E8%AF%BB%E7%AE%80%E4%BB%8B2.jpg)

app/src/main/assets/updateLog.md

@@ -3,6 +3,10 @@
 * 关注合作公众号 **[小说拾遗]()** 获取好看的小说。
 - 旧版数据导入教程：先在旧版阅读(2.x)中进行备份，然后在新版阅读(3.x)【我的】->【备份与恢复】，选择【导入旧版本数据】。
 
+**2020/09/12**
+* web看书同步最新章
+* web写源增加图片样式等规则
+
 **2020/09/11**
 * 修复一些bug
 * 背景配置自由添加

app/src/main/assets/web/index.html

@@ -14,7 +14,7 @@
             <div class="rules">
                 <div><b>基本</b></div>
                 <div>
-                    <div>源URL　:</div>
+                    <div>源域名　:</div>
                     <textarea rows="1" id="bookSourceUrl" class="base" title="bookSourceUrl"
                         placeholder="<必填>通常填写网站主页,例: https://www.qidian.com"></textarea>
                 </div>
@@ -33,16 +33,16 @@
                     <textarea rows="1" id="bookSourceGroup" class="base" title="bookSourceGroup"
                         placeholder="&lt;选填&gt;描述书源的特征信息"></textarea>
                 </div>
+                <div>
+                    <div>源注释　:</div>
+                    <textarea rows="1" id="bookSourceComment" class="base" title="bookSourceComment"
+                              placeholder="&lt;选填&gt;描述书源作者和状态"></textarea>
+                </div>
                 <div>
                     <div>登录地址:</div>
                     <textarea rows="1" id="loginUrl" class="base" title="loginUrl"
                         placeholder="&lt;选填&gt;填写网站登录网址,仅在需要登录的书源有用"></textarea>
                 </div>
-                <div>
-                    <div>注释:</div>
-                    <textarea rows="1" id="bookSourceComment" class="base" title="bookSourceComment"
-                              placeholder="&lt;选填&gt;描述书源作者和状态"></textarea>
-                </div>
                 <div>
                     <div>链接验证:</div>
                     <textarea rows="1" id="bookUrlPattern" class="base" title="bookUrlPattern"
@@ -56,7 +56,7 @@
                 <div><b>搜索</b></div>
                 <div>
                     <div>搜索地址:</div>
-                    <textarea rows="1" id="searchUrl" class="base" title="searchUrl"
+                    <textarea rows="3" id="searchUrl" class="base" title="searchUrl"
                         placeholder="[域名可省略]/search.php@kw={{key}}"></textarea>
                 </div>
                 <div>
@@ -250,13 +250,23 @@
                 <div>
                     <div>脚本注入:</div>
                     <textarea rows="3" id="ruleContent_webJs" class="ruleContent" title="webJs"
-                        placeholder="注入javascript，用于模拟鼠标点击等，无返回结果"></textarea>
+                        placeholder="注入javascript，用于模拟鼠标点击等，必须有返回值，一般为String类型"></textarea>
                 </div>
                 <div>
                     <div>资源正则:</div>
                     <textarea rows="1" id="ruleContent_sourceRegex" class="ruleContent" title="sourceRegex"
                         placeholder="匹配资源的url特征，用于嗅探"></textarea>
                 </div>
+                <div>
+                    <div>替换规则:</div>
+                    <textarea rows="1" id="ruleContent_replaceRegex" class="ruleContent" title="replaceRegex"
+                        placeholder="多页内容合并后替换，用于正文净化"></textarea>
+                </div>
+                <div>
+                    <div>图片样式:</div>
+                    <textarea rows="1" id="ruleContent_imageStyle" class="ruleContent" title="imageStyle"
+                        placeholder="FULL:铺满 不填:默认样式"></textarea>
+                </div>
                 <p></p>
                 <div><b>其它规则</b></div>
                 <div>
@@ -353,19 +363,19 @@
                     </div>
                     <div class="tab4">
                         <div class="context link">
-                            <a target="_blank" href="https://celeter.github.io">源制作教程</a>
+                            <a target="_blank" href="https://alanskycn.gitee.io/teachme">源制作教程</a>
                             <a target="_blank" href="https://zhuanlan.zhihu.com/p/29436838">Xpath基础教程</a>
                             <a target="_blank" href="https://zhuanlan.zhihu.com/p/32187820">Xpath高级教程</a>
-                            <a target="_blank" href="https://www.w3cschool.cn/regex_rmjc/?">正则表达式教程</a>
+                            <a target="_blank" href="https://www.w3cschool.cn/regex_rmjc">正则表达式教程</a>
-                            <a target="_blank" href="https://regexr.com/">正则表达式在线验证工具</a>
+                            <a target="_blank" href="https://regexr.com">正则表达式在线验证工具</a>
                             <div>^$()[]{}.?+*| 这些是Java正则特殊符号,匹配需转义
                                 <br>(?s) 前缀表示跨行解析
                                 <br>(?m) 前缀表示逐行匹配
                                 <br>(?i) 前缀表示忽略大小写
                             </div>
-                            <a target="_blank" href="https://www.beta.browxy.com/">代码在线运行工具</a>
+                            <a target="_blank" href="https://www.beta.browxy.com">代码在线运行工具</a>
                             <a target="_blank" href="bookshelf.html">阅读书架(经典)</a>
-							<a target="_blank" href="new/bookshelf.html">阅读书架(新潮)</a>
+                            <a target="_blank" href="new/index.html">阅读书架(新潮)</a>
                         </div>
                     </div>
                 </div>

app/src/main/assets/web/index.js

@@ -18,7 +18,7 @@ function hashParam(key, val) {
 	}
 }
 // 创建书源规则容器对象
-const RuleJSON = (() => {
+function Container() {
 	let ruleJson = {};
 	let searchJson = {};
 	let exploreJson = {};
@@ -33,7 +33,6 @@ const RuleJSON = (() => {
 	ruleJson.weight = 0;
 	ruleJson.enabled = true;
 	ruleJson.enabledExplore = true;
-    ruleJson.bookSourceComment = ""
 
 	// 搜索规则
 	$$('.rules .ruleSearch').forEach(item => searchJson[item.title] = '');
@@ -61,7 +60,7 @@ const RuleJSON = (() => {
 	ruleJson.ruleContent = contentJson;
 
 	return ruleJson;
-})();
+}
 // 选项卡Tab切换事件处理
 function showTab(tabName) {
 	$$('.tabtitle>*').forEach(node => { node.className = node.className.replace(' this', ''); });
@@ -107,6 +106,7 @@ function HttpPost(url, data) {
 }
 // 将书源表单转化为书源对象
 function rule2json() {
+	let RuleJSON = Container();
 	// 转换base
 	Object.keys(RuleJSON).forEach(key => {
 		if (!key.startsWith("rule")) {
@@ -118,7 +118,8 @@ function rule2json() {
 	let searchJson = {};
 	//Object.keys(JSON.parse(RuleJSON.ruleSearch)).forEach(key => {
 	Object.keys(RuleJSON.ruleSearch).forEach(key => {
-		searchJson[key] = $('#' + 'ruleSearch_' + key).value;
+		if ($('#' + 'ruleSearch_' + key).value)
+			searchJson[key] = $('#' + 'ruleSearch_' + key).value;
 	});
 	//RuleJSON.ruleSearch = JSON.stringify(searchJson);
 	RuleJSON.ruleSearch = searchJson;
@@ -127,7 +128,8 @@ function rule2json() {
 	let exploreJson = {};
 	//Object.keys(JSON.parse(RuleJSON.ruleExplore)).forEach(key => {
 	Object.keys(RuleJSON.ruleExplore).forEach(key => {
-		exploreJson[key] = $('#' + 'ruleExplore_' + key).value;
+		if ($('#' + 'ruleExplore_' + key).value)
+			exploreJson[key] = $('#' + 'ruleExplore_' + key).value;
 	});
 	//RuleJSON.ruleExplore = JSON.stringify(exploreJson);
 	RuleJSON.ruleExplore = exploreJson;
@@ -136,7 +138,8 @@ function rule2json() {
 	let bookInfoJson = {};
 	//Object.keys(JSON.parse(RuleJSON.ruleBookInfo)).forEach(key => {
 	Object.keys(RuleJSON.ruleBookInfo).forEach(key => {
-		bookInfoJson[key] = $('#' + 'ruleBookInfo_' + key).value;
+		if ($('#' + 'ruleBookInfo_' + key).value)
+			bookInfoJson[key] = $('#' + 'ruleBookInfo_' + key).value;
 	});
 	//RuleJSON.ruleBookInfo = JSON.stringify(bookInfoJson);
 	RuleJSON.ruleBookInfo = bookInfoJson;
@@ -145,7 +148,8 @@ function rule2json() {
 	let tocJson = {};
 	//Object.keys(JSON.parse(RuleJSON.ruleToc)).forEach(key => {
 	Object.keys(RuleJSON.ruleToc).forEach(key => {
-		tocJson[key] = $('#' + 'ruleToc_' + key).value;
+		if ($('#' + 'ruleToc_' + key).value)
+			tocJson[key] = $('#' + 'ruleToc_' + key).value;
 	});
 	//RuleJSON.ruleToc = JSON.stringify(tocJson);
 	RuleJSON.ruleToc = tocJson;
@@ -154,13 +158,13 @@ function rule2json() {
 	let contentJson = {};
 	//Object.keys(JSON.parse(RuleJSON.ruleContent)).forEach(key => {
 	Object.keys(RuleJSON.ruleContent).forEach(key => {
-		contentJson[key] = $('#' + 'ruleContent_' + key).value;
+		if ($('#' + 'ruleContent_' + key).value)
+			contentJson[key] = $('#' + 'ruleContent_' + key).value;
 	});
 	//RuleJSON.ruleContent = JSON.stringify(contentJson);
 	RuleJSON.ruleContent = contentJson;
 
 	RuleJSON.lastUpdateTime = RuleJSON.lastUpdateTime == '' ? 0 : parseInt(RuleJSON.lastUpdateTime);
-	RuleJSON.bookSourceComment = RuleJSON.bookSourceComment == '' ? "" : String(RuleJSON.bookSourceComment);
 	RuleJSON.customOrder = RuleJSON.customOrder == '' ? 0 : parseInt(RuleJSON.customOrder);
 	RuleJSON.weight = RuleJSON.weight == '' ? 0 : parseInt(RuleJSON.weight);
 	RuleJSON.bookSourceType == RuleJSON.bookSourceType == '' ? 0 : parseInt(RuleJSON.weight);
@@ -170,6 +174,7 @@ function rule2json() {
 }
 // 将书源对象填充到书源表单
 function json2rule(RuleEditor) {
+	let RuleJSON = Container();
 	// 转换base
 	Object.keys(RuleJSON).forEach(key => {
 		if (!key.startsWith("rule")) {

app/src/main/assets/web/new/bookshelf.html

@@ -1,3 +0,0 @@
-<!DOCTYPE html><html lang=en style="padding: 0;height:100%"><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="favicon.ico" /><![endif]--><title>yd-web-tool</title><link href=css/about.8c965d87.css rel=prefetch><link href=css/detail.fb767a87.css rel=prefetch><link href=js/about.a0534951.js rel=prefetch><link href=js/about~detail.47586100.js rel=prefetch><link href=js/detail.ff471d08.js rel=prefetch><link href=css/app.e1c0d2e4.css rel=preload as=style><link href=css/chunk-vendors.ad4ff18f.css rel=preload as=style><link href=js/app.a7aae935.js rel=preload as=script><link href=js/chunk-vendors.c98251cd.js rel=preload as=script><link href=css/chunk-vendors.ad4ff18f.css rel=stylesheet><link href=css/app.e1c0d2e4.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png><link rel=manifest href=manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=yd-web-tool><link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><style>body::-webkit-scrollbar {
-      display: none;
-    }</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.c98251cd.js></script><script src=js/app.a7aae935.js></script></body></html>

app/src/main/assets/web/new/index.html

@@ -0,0 +1,3 @@
+<!DOCTYPE html><html lang=en style="padding: 0;height:100%"><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="favicon.ico" /><![endif]--><title>Legado Bookshelf</title><link href=css/about.dbe575e1.css rel=prefetch><link href=css/detail.9ba76c69.css rel=prefetch><link href=js/about.59a63964.js rel=prefetch><link href=js/about~detail.1caf6ef5.js rel=prefetch><link href=js/detail.11777eca.js rel=prefetch><link href=css/app.e4c919b7.css rel=preload as=style><link href=css/chunk-vendors.ad4ff18f.css rel=preload as=style><link href=js/app.d7843716.js rel=preload as=script><link href=js/chunk-vendors.8dd9045a.js rel=preload as=script><link href=css/chunk-vendors.ad4ff18f.css rel=stylesheet><link href=css/app.e4c919b7.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png><link rel=manifest href=manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=yd-web-tool><link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><style>body::-webkit-scrollbar {
+      display: none;
+    }</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.8dd9045a.js></script><script src=js/app.d7843716.js></script></body></html>

app/src/main/assets/web/new/precache-manifest.78eb8adcb8f052b2a72d462abe0dc498.js

@@ -1,19 +1,19 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "80a8de284bb3fa9a4a9f",
+    "revision": "a77097c019b699bc81ee",
-    "url": "css/about.8c965d87.css"
+    "url": "css/about.dbe575e1.css"
   },
   {
-    "revision": "9da3e990110565bfa57c",
+    "revision": "4d729c4b428d537ebd8d",
-    "url": "css/app.e1c0d2e4.css"
+    "url": "css/app.e4c919b7.css"
   },
   {
-    "revision": "c900d6091039998c94b9",
+    "revision": "3e91096748e0f4d6bb89",
     "url": "css/chunk-vendors.ad4ff18f.css"
   },
   {
-    "revision": "607ffe83acdcd9c9180e",
+    "revision": "8f2124417070a994ebbd",
-    "url": "css/detail.fb767a87.css"
+    "url": "css/detail.9ba76c69.css"
   },
   {
     "revision": "535877f50039c0cb49a6196a5b7517cd",
@@ -40,35 +40,35 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "img/noCover.b5c48bc1.jpeg"
   },
   {
-    "revision": "1006935c8b91408961a7012a08445ffd",
+    "revision": "ad9f43586bb9220e0df71ce8fad92d8b",
     "url": "index.html"
   },
   {
-    "revision": "80a8de284bb3fa9a4a9f",
+    "revision": "a77097c019b699bc81ee",
-    "url": "js/about.a0534951.js"
+    "url": "js/about.59a63964.js"
   },
   {
-    "revision": "8e5e793e10c338503af6",
+    "revision": "2c81bd893f3a92f018d8",
-    "url": "js/about~detail.47586100.js"
+    "url": "js/about~detail.1caf6ef5.js"
   },
   {
-    "revision": "9da3e990110565bfa57c",
+    "revision": "4d729c4b428d537ebd8d",
-    "url": "js/app.a7aae935.js"
+    "url": "js/app.d7843716.js"
   },
   {
-    "revision": "c900d6091039998c94b9",
+    "revision": "3e91096748e0f4d6bb89",
-    "url": "js/chunk-vendors.c98251cd.js"
+    "url": "js/chunk-vendors.8dd9045a.js"
   },
   {
-    "revision": "607ffe83acdcd9c9180e",
+    "revision": "8f2124417070a994ebbd",
-    "url": "js/detail.ff471d08.js"
+    "url": "js/detail.11777eca.js"
   },
   {
     "revision": "b46d04eb43bc31ca0f9f95121646440d",
     "url": "manifest.json"
   },
   {
-    "revision": "735ab4f94fbcd57074377afca324c813",
+    "revision": "b6216d61c03e6ce0c9aea6ca7808f7ca",
     "url": "robots.txt"
   }
 ]);

app/src/main/assets/web/new/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:

app/src/main/assets/web/new/service-worker.js

@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "precache-manifest.9ae0b839acd886dbe2adc2f9d92aeabf.js"
+  "precache-manifest.78eb8adcb8f052b2a72d462abe0dc498.js"
 );
 
 workbox.core.setCacheNameDetails({prefix: "yd-web-tool"});

app/src/main/res/values/pref_key_value.xml

@@ -13,7 +13,7 @@
     <string name="pk_check_update" translatable="false">checkUpdate</string>
     <string name="legado_gzh" translatable="false">开源阅读</string>
 
-    <string name="source_rule_url" translatable="false">https://celeter.github.io/</string>
+    <string name="source_rule_url" translatable="false">https://alanskycn.gitee.io/teachme/</string>
     <string name="this_github_url" translatable="false">https://github.com/gedoor/legado</string>
     <string name="contributors_url" translatable="false">https://github.com/gedoor/legado/graphs/contributors</string>
     <string name="disclaimer_url" translatable="false">https://gedoor.github.io/MyBookshelf/disclaimer.html</string>