From e72682b3fbfdcfe3fd0e51e0b8e74a521d2588c8 Mon Sep 17 00:00:00 2001 From: syomie Date: Mon, 28 Feb 2022 10:09:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A5=E5=85=A8?= =?UTF-8?q?=E5=AF=B9=E5=88=97=E8=A1=A8=E9=A1=B9=E7=9A=84=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/help/ruleComplete.kt | 6 +-- .../source/edit/BookSourceEditActivity.kt | 50 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/ruleComplete.kt b/app/src/main/java/io/legado/app/help/ruleComplete.kt index 49a2a3721..af699e667 100644 --- a/app/src/main/java/io/legado/app/help/ruleComplete.kt +++ b/app/src/main/java/io/legado/app/help/ruleComplete.kt @@ -2,10 +2,10 @@ package io.legado.app.help // 补全时忽略匹配规则 val completeIgnore = - Regex("""\\n|##|@js:||@Json:|\$.|(attr|text|ownText|textNodes|href|content|html|alt|all|value|src)(\(\)|##.*)?\s*$""") + Regex("""\\n|##|@js:||@Json:|\$\.|(attr|text|ownText|textNodes|href|content|html|alt|all|value|src)(\(\)|##.*)?\s*$""",RegexOption.MULTILINE) -// 补全时忽略匹配的规则(仅对详情页预处理规则生效) -val completeIgnorePreRule = Regex("""^:|##|@js:||@Json:|\$.""") +// 补全时忽略匹配的规则(判断列表项和详情页预处理规则生效) +val completeIgnorePreRule = Regex("""^:|##|@js:||@Json:|\$\.""") // 匹配从图片获取信息的规则 val imgComplete = Regex( diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index 508911fc7..8187cf283 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -327,38 +327,38 @@ class BookSourceEditActivity : when (it.key) { "searchUrl" -> source.searchUrl = it.value "checkKeyWord" -> searchRule.checkKeyWord = it.value - "bookList" -> searchRule.bookList = it.value - "name" -> searchRule.name = ruleComplete(it.value) - "author" -> searchRule.author = ruleComplete(it.value) - "kind" -> searchRule.kind = ruleComplete(it.value) - "intro" -> searchRule.intro = ruleComplete(it.value) - "updateTime" -> searchRule.updateTime = ruleComplete(it.value) - "wordCount" -> searchRule.wordCount = ruleComplete(it.value) - "lastChapter" -> searchRule.lastChapter = ruleComplete(it.value) - "coverUrl" -> searchRule.coverUrl = ruleComplete(it.value, type = 3) - "bookUrl" -> searchRule.bookUrl = ruleComplete(it.value, type = 2) + "bookList" -> searchRule.bookList = it.value ?: "" + "name" -> searchRule.name = ruleComplete(it.value,searchRule.bookList) + "author" -> searchRule.author = ruleComplete(it.value,searchRule.bookList) + "kind" -> searchRule.kind = ruleComplete(it.value,searchRule.bookList) + "intro" -> searchRule.intro = ruleComplete(it.value,searchRule.bookList) + "updateTime" -> searchRule.updateTime = ruleComplete(it.value,searchRule.bookList) + "wordCount" -> searchRule.wordCount = ruleComplete(it.value,searchRule.bookList) + "lastChapter" -> searchRule.lastChapter = ruleComplete(it.value,searchRule.bookList) + "coverUrl" -> searchRule.coverUrl = ruleComplete(it.value,searchRule.bookList, type = 3) + "bookUrl" -> searchRule.bookUrl = ruleComplete(it.value,searchRule.bookList, type = 2) } } findEntities.forEach { when (it.key) { "exploreUrl" -> source.exploreUrl = it.value - "bookList" -> exploreRule.bookList = it.value - "name" -> exploreRule.name = ruleComplete(it.value) - "author" -> exploreRule.author = ruleComplete(it.value) - "kind" -> exploreRule.kind = ruleComplete(it.value) - "intro" -> exploreRule.intro = ruleComplete(it.value) - "updateTime" -> exploreRule.updateTime = ruleComplete(it.value) - "wordCount" -> exploreRule.wordCount = ruleComplete(it.value) - "lastChapter" -> exploreRule.lastChapter = ruleComplete(it.value) - "coverUrl" -> exploreRule.coverUrl = ruleComplete(it.value, type = 3) - "bookUrl" -> exploreRule.bookUrl = ruleComplete(it.value, type = 2) + "bookList" -> exploreRule.bookList = it.value ?: "" + "name" -> exploreRule.name = ruleComplete(it.value,exploreRule.bookList) + "author" -> exploreRule.author = ruleComplete(it.value,exploreRule.bookList) + "kind" -> exploreRule.kind = ruleComplete(it.value,exploreRule.bookList) + "intro" -> exploreRule.intro = ruleComplete(it.value,exploreRule.bookList) + "updateTime" -> exploreRule.updateTime = ruleComplete(it.value,exploreRule.bookList) + "wordCount" -> exploreRule.wordCount = ruleComplete(it.value,exploreRule.bookList) + "lastChapter" -> exploreRule.lastChapter = ruleComplete(it.value,exploreRule.bookList) + "coverUrl" -> exploreRule.coverUrl = ruleComplete(it.value,exploreRule.bookList, type = 3) + "bookUrl" -> exploreRule.bookUrl = ruleComplete(it.value,exploreRule.bookList, type = 2) } } infoEntities.forEach { when (it.key) { "init" -> bookInfoRule.init = it.value ?: "" "name" -> bookInfoRule.name = ruleComplete(it.value, bookInfoRule.init) - "author" -> bookInfoRule.author = ruleComplete(it.value, bookInfoRule.init) + "author" -> bookInfoRule.author = ruleComplete(it.value,tocRule.chapterList, bookInfoRule.init) "kind" -> bookInfoRule.kind = ruleComplete(it.value, bookInfoRule.init) "intro" -> bookInfoRule.intro = ruleComplete(it.value, bookInfoRule.init) "updateTime" -> bookInfoRule.updateTime = ruleComplete(it.value, bookInfoRule.init) @@ -372,14 +372,14 @@ class BookSourceEditActivity : } tocEntities.forEach { when (it.key) { - "chapterList" -> tocRule.chapterList = it.value - "chapterName" -> tocRule.chapterName = ruleComplete(it.value) - "chapterUrl" -> tocRule.chapterUrl = ruleComplete(it.value, type = 2) + "chapterList" -> tocRule.chapterList = it.value ?: "" + "chapterName" -> tocRule.chapterName = ruleComplete(it.value,tocRule.chapterList) + "chapterUrl" -> tocRule.chapterUrl = ruleComplete(it.value,tocRule.chapterList, type = 2) "isVolume" -> tocRule.isVolume = it.value "updateTime" -> tocRule.updateTime = it.value "isVip" -> tocRule.isVip = it.value "isPay" -> tocRule.isPay = it.value - "nextTocUrl" -> tocRule.nextTocUrl = ruleComplete(it.value, type = 2) + "nextTocUrl" -> tocRule.nextTocUrl = ruleComplete(it.value,tocRule.chapterList, type = 2) } } contentEntities.forEach { From 4e7ac2f5c9ff92c189fbb7ed0b63dae3059dc71e Mon Sep 17 00:00:00 2001 From: syomie Date: Mon, 28 Feb 2022 10:29:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/book/source/edit/BookSourceEditActivity.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index 8187cf283..28803d546 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -335,8 +335,8 @@ class BookSourceEditActivity : "updateTime" -> searchRule.updateTime = ruleComplete(it.value,searchRule.bookList) "wordCount" -> searchRule.wordCount = ruleComplete(it.value,searchRule.bookList) "lastChapter" -> searchRule.lastChapter = ruleComplete(it.value,searchRule.bookList) - "coverUrl" -> searchRule.coverUrl = ruleComplete(it.value,searchRule.bookList, type = 3) - "bookUrl" -> searchRule.bookUrl = ruleComplete(it.value,searchRule.bookList, type = 2) + "coverUrl" -> searchRule.coverUrl = ruleComplete(it.value,searchRule.bookList,3) + "bookUrl" -> searchRule.bookUrl = ruleComplete(it.value,searchRule.bookList,2) } } findEntities.forEach { @@ -350,15 +350,15 @@ class BookSourceEditActivity : "updateTime" -> exploreRule.updateTime = ruleComplete(it.value,exploreRule.bookList) "wordCount" -> exploreRule.wordCount = ruleComplete(it.value,exploreRule.bookList) "lastChapter" -> exploreRule.lastChapter = ruleComplete(it.value,exploreRule.bookList) - "coverUrl" -> exploreRule.coverUrl = ruleComplete(it.value,exploreRule.bookList, type = 3) - "bookUrl" -> exploreRule.bookUrl = ruleComplete(it.value,exploreRule.bookList, type = 2) + "coverUrl" -> exploreRule.coverUrl = ruleComplete(it.value,exploreRule.bookList,3) + "bookUrl" -> exploreRule.bookUrl = ruleComplete(it.value,exploreRule.bookList,2) } } infoEntities.forEach { when (it.key) { "init" -> bookInfoRule.init = it.value ?: "" "name" -> bookInfoRule.name = ruleComplete(it.value, bookInfoRule.init) - "author" -> bookInfoRule.author = ruleComplete(it.value,tocRule.chapterList, bookInfoRule.init) + "author" -> bookInfoRule.author = ruleComplete(it.value, bookInfoRule.init) "kind" -> bookInfoRule.kind = ruleComplete(it.value, bookInfoRule.init) "intro" -> bookInfoRule.intro = ruleComplete(it.value, bookInfoRule.init) "updateTime" -> bookInfoRule.updateTime = ruleComplete(it.value, bookInfoRule.init) @@ -374,12 +374,12 @@ class BookSourceEditActivity : when (it.key) { "chapterList" -> tocRule.chapterList = it.value ?: "" "chapterName" -> tocRule.chapterName = ruleComplete(it.value,tocRule.chapterList) - "chapterUrl" -> tocRule.chapterUrl = ruleComplete(it.value,tocRule.chapterList, type = 2) + "chapterUrl" -> tocRule.chapterUrl = ruleComplete(it.value,tocRule.chapterList, 2) "isVolume" -> tocRule.isVolume = it.value "updateTime" -> tocRule.updateTime = it.value "isVip" -> tocRule.isVip = it.value "isPay" -> tocRule.isPay = it.value - "nextTocUrl" -> tocRule.nextTocUrl = ruleComplete(it.value,tocRule.chapterList, type = 2) + "nextTocUrl" -> tocRule.nextTocUrl = ruleComplete(it.value,tocRule.chapterList,2) } } contentEntities.forEach {