From c5947aba68a7c72ca9e1e16df46f54a66e53cb2e Mon Sep 17 00:00:00 2001 From: Horis <8674809+821938089@users.noreply.github.com> Date: Sun, 20 Apr 2025 12:09:00 +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/ruleHelp.md | 2 ++ app/src/main/java/io/legado/app/model/SharedJsScope.kt | 7 ------- .../java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt | 2 +- app/src/main/java/io/legado/app/model/webBook/BookList.kt | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/assets/web/help/md/ruleHelp.md b/app/src/main/assets/web/help/md/ruleHelp.md index b2de05d29..6b57fad83 100644 --- a/app/src/main/assets/web/help/md/ruleHelp.md +++ b/app/src/main/assets/web/help/md/ruleHelp.md @@ -17,6 +17,8 @@ > `JavaScript Code` 直接填写JavaScript片段 > `{"example":"https://www.example.com/js/example.js", ...}` 自动复用已经下载的js文件 +> 注意此处定义的函数可能会被多个线程同时调用,在函数里的全局变量内容将会共享使用,对其进行修改可能会出现竞争问题 + * 并发率 > 并发限制,单位ms,可填写两种格式 diff --git a/app/src/main/java/io/legado/app/model/SharedJsScope.kt b/app/src/main/java/io/legado/app/model/SharedJsScope.kt index 7e14f596d..3ddee85ce 100644 --- a/app/src/main/java/io/legado/app/model/SharedJsScope.kt +++ b/app/src/main/java/io/legado/app/model/SharedJsScope.kt @@ -70,13 +70,6 @@ object SharedJsScope { if (scope is ScriptableObject) { scope.sealObject() } - if (scope is Map<*, *>) { - scope.entries.forEach { - if (it is ScriptableObject) { - it.sealObject() - } - } - } scopeMap[key] = WeakReference(scope) } return scope diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt index e997d9e1e..d9997d813 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt @@ -97,7 +97,7 @@ class AnalyzeUrl( private set var type: String? = null private set - val headerMap = HashMap() + val headerMap = LinkedHashMap() private var urlNoQuery: String = "" private var encodedForm: String? = null private var encodedQuery: String? = null diff --git a/app/src/main/java/io/legado/app/model/webBook/BookList.kt b/app/src/main/java/io/legado/app/model/webBook/BookList.kt index 9374ad4aa..f85496351 100644 --- a/app/src/main/java/io/legado/app/model/webBook/BookList.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookList.kt @@ -189,7 +189,7 @@ object BookList { baseUrl: String, variable: String?, log: Boolean, - filter: ((name: String, author: String) -> Boolean)? = null, + filter: ((name: String, author: String) -> Boolean)?, ruleName: List, ruleBookUrl: List, ruleAuthor: List,