From da689a3c4d06223c1fcc9881e82120b02407a5e3 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Mon, 31 Oct 2022 22:08:24 +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 --- .../main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 f0f9ce1c1..ec5933448 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 @@ -108,6 +108,7 @@ class AnalyzeUrl( var start = 0 var tmp: String val jsMatcher = JS_PATTERN.matcher(ruleUrl) + var hasRule = true while (jsMatcher.find()) { if (jsMatcher.start() > start) { tmp = @@ -118,8 +119,11 @@ class AnalyzeUrl( } ruleUrl = evalJS(jsMatcher.group(2) ?: jsMatcher.group(1), ruleUrl) as String start = jsMatcher.end() + if (jsMatcher.group(0)!!.startsWith("@js:", true)) { + hasRule = false + } } - if (ruleUrl.length > start) { + if (ruleUrl.length > start && hasRule) { tmp = ruleUrl.substring(start).trim { it <= ' ' } if (tmp.isNotEmpty()) { ruleUrl = tmp.replace("@result", ruleUrl)