Merge remote-tracking branch 'origin/master'

app/src/main/assets/txtTocRule.json

@@ -1,44 +1,44 @@
 [
     {
         "enable": true,
-      "name": "数字 分隔符 标题名称",
-      "rule": "^[ \\t]{0,4}\\d{1,5}[\\,\\.， 、\\-].{1,30}$",
+        "name": "目录",
+        "rule": "^[ \\t]{0,4}(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
         "serialNumber": 0
     },
     {
-      "enable": true,
-      "name": "目录",
-      "rule": "^[ \\t]{0,4}(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "enable": false,
+        "name": "目录(不匹配行前空白)",
+        "rule": "^(?<=\\s)(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
         "serialNumber": 1
     },
     {
         "enable": false,
-      "name": "目录(不匹配行前空白)",
-      "rule": "^(?<=\\s)(?:(?:内容|文章)?简介|前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "name": "目录(去简介)",
+        "rule": "^(?<=\\s)(?:前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
         "serialNumber": 2
     },
     {
         "enable": false,
-      "name": "目录(去简介)",
-      "rule": "^(?<=\\s)(?:前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "name": "目录(古典、轻小说备用)",
+        "rule": "^[ \\t]{0,4}(?:前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
         "serialNumber": 3
     },
     {
-      "enable": false,
-      "name": "目录(古典小说备用)",
-      "rule": "^[ \\t]{0,4}(?:前言|序章|楔子|正文(?!完)|[Cc]hapter|[Ss]ection|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|场(?![和合比电是])|篇(?!张))).{0,30}$",
+        "enable": true,
+        "name": "数字 分隔符 标题名称",
+        "rule": "^[ \\t]{0,4}\\d{1,5}[\\,\\.， 、\\-].{1,30}$",
         "serialNumber": 4
     },
     {
         "enable": true,
-      "name": "Chapter/Section/Part 序号 标题",
-      "rule": "^[ \\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art)\\s{0,4}\\d{1,4}.{0,30}$",
+        "name": "正文 标题/序号",
+        "rule": "^[ \\t]{0,4}正文\\s{1,4}.{0,20}$",
         "serialNumber": 5
     },
     {
         "enable": true,
-      "name": "正文 标题/序号",
-      "rule": "^[ \\t]{0,4}正文\\s{1,4}.{0,20}$",
+        "name": "Chapter/Section/Part 序号 标题",
+        "rule": "^[ \\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art)\\s{0,4}\\d{1,4}.{0,30}$",
         "serialNumber": 6
     },
     {
@@ -50,13 +50,19 @@
     {
         "enable": true,
         "name": "特殊符号 标题",
-      "rule": "^[ \\t]{0,4}[〈〖〔【☆★].{1,30}[】〕〗〉]?\\s{0,4}$",
+        "rule": "^[ \\t]{0,4}[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
         "serialNumber": 8
     },
     {
         "enable":false,
         "name": "特殊符号 标题(不匹配空白字符)",
-      "rule": "(?<=\\s)[〈〖〔【☆★].{1,30}[】〕〗〉]?\\s{0,4}$",
+        "rule": "^(?<=\\s)[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
         "serialNumber": 9
+    },
+    {
+        "enable":false,
+        "name": "顶格标题",
+        "rule": "^\\S.{1,20}$",
+        "serialNumber": 10
     }
 ]

app/src/main/java/io/legado/app/constant/AppConst.kt

@@ -22,7 +22,7 @@ object AppConst {
     const val UA_NAME = "User-Agent"
 
     val userAgent: String by lazy {
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36"
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36"
     }
 
     val SCRIPT_ENGINE: ScriptEngine by lazy {

app/src/main/java/io/legado/app/help/storage/OldRule.kt

@@ -100,15 +100,22 @@ object OldRule {
         if (oldRule.isNullOrBlank()) return null
         var newRule = oldRule
         var reverse = false
+        var allinone = false
         if (oldRule.startsWith("-")) {
             reverse = true
             newRule = oldRule.substring(1)
         }
+        if (newRule.startsWith("+")) {
+            allinone = true
+            newRule = newRule.substring(1)
+        }
         if (!newRule.startsWith("@CSS:", true) &&
             !newRule.startsWith("@XPath:", true) &&
             !newRule.startsWith("//") &&
             !newRule.startsWith("##") &&
-            !newRule.startsWith(":")
+            !newRule.startsWith(":") &&
+            !newRule.contains("@js:",true) &&
+            !newRule.contains("<js>",true)
         ) {
             if (newRule.contains("#") && !newRule.contains("##")) {
                 newRule = oldRule.replace("#", "##")
@@ -134,8 +141,11 @@ object OldRule {
                 newRule = newRule.replace("&", "&&")
             }
         }
+        if (allinone) {
+            newRule = "+" + newRule
+        }
         if (reverse) {
-            newRule += "-"
+            newRule = "-" + newRule
         }
         return newRule
     }
@@ -145,7 +155,7 @@ object OldRule {
         if (!oldUrls.contains("\n") && !oldUrls.contains("&&"))
             return toNewUrl(oldUrls)
 
-        val urls = oldUrls.split("(&&|\n)+".toRegex())
+        val urls = oldUrls.split("(&&|\r?\n)+".toRegex())
         return urls.map {
             toNewUrl(it)?.replace("\n\\s*".toRegex(), "")
         }.joinToString("\n")

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

@@ -135,6 +135,6 @@
     <string-array name="system_typefaces">
         <item>系统默认字体</item>
         <item>系统衬线字体</item>
-        <item>系统等宽等宽</item>
+        <item>系统等宽字体</item>
     </string-array>
 </resources>