From 9f2e507caa0a0affe0ec9d584accfe67cd7d6cc6 Mon Sep 17 00:00:00 2001 From: Horis <8674809+821938089@users.noreply.github.com> Date: Fri, 2 May 2025 15:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/web/help/md/jsHelp.md | 2 +- .../app/model/analyzeRule/AnalyzeRule.kt | 19 ++++--------------- .../io/legado/app/model/webBook/WebBook.kt | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/app/src/main/assets/web/help/md/jsHelp.md b/app/src/main/assets/web/help/md/jsHelp.md index cbd3c00f8..8017283b4 100644 --- a/app/src/main/assets/web/help/md/jsHelp.md +++ b/app/src/main/assets/web/help/md/jsHelp.md @@ -87,7 +87,7 @@ java.getElements(ruleStr: String) * 重新搜索书籍/重新获取目录url -> 可以在刷新目录之前使用,有些书源书籍地址和目录url会变 +> 只能在刷新目录之前使用,有些书源书籍地址和目录url会变 ```js java.reGetBook() diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt index e10da95f9..e2d982bbc 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt @@ -48,7 +48,8 @@ import kotlin.coroutines.EmptyCoroutineContext @Suppress("unused", "RegExpRedundantEscape", "MemberVisibilityCanBePrivate") class AnalyzeRule( var ruleData: RuleDataInterface? = null, - private val source: BaseSource? = null + private val source: BaseSource? = null, + private val preUpdateJs: Boolean = false ) : JsExtensions { val book get() = ruleData as? BaseBook @@ -815,6 +816,7 @@ class AnalyzeRule( * 重新获取book */ fun reGetBook() { + if (!preUpdateJs) return val bookSource = source as? BookSource val book = book as? Book if (bookSource == null || book == null) return @@ -832,24 +834,11 @@ class AnalyzeRule( } } - /** - * 刷新详情页 - */ - fun refreshBook() { - val bookSource = source as? BookSource - val book = book as? Book - if (bookSource == null || book == null) return - runBlocking(coroutineContext) { - withTimeout(1800000) { - WebBook.getBookInfoAwait(bookSource, book, false) - } - } - } - /** * 更新tocUrl,有些书源目录url定期更新,可以在js调用更新 */ fun refreshTocUrl() { + if (!preUpdateJs) return val bookSource = source as? BookSource val book = book as? Book if (bookSource == null || book == null) return diff --git a/app/src/main/java/io/legado/app/model/webBook/WebBook.kt b/app/src/main/java/io/legado/app/model/webBook/WebBook.kt index 7537a33f3..cc071e7d9 100644 --- a/app/src/main/java/io/legado/app/model/webBook/WebBook.kt +++ b/app/src/main/java/io/legado/app/model/webBook/WebBook.kt @@ -212,7 +212,7 @@ object WebBook { return kotlin.runCatching { val preUpdateJs = bookSource.ruleToc?.preUpdateJs if (!preUpdateJs.isNullOrBlank()) { - AnalyzeRule(book, bookSource) + AnalyzeRule(book, bookSource, true) .setCoroutineContext(coroutineContext) .evalJS(preUpdateJs) }