From 185f25dd6b2e579336ead5fb68d46dbd3f5b43e4 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 12 Aug 2022 22:28:02 +0800 Subject: [PATCH 1/2] fix(AnalyzeUrl): skip analyze when mUrl is DataURL --- .../legado/app/model/analyzeRule/AnalyzeUrl.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 d24e56de4..dcc5d04ac 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 @@ -72,18 +72,16 @@ class AnalyzeUrl( private val enabledCookieJar = source?.enabledCookieJar ?: false init { - if (!mUrl.isDataUrl()) { - val urlMatcher = paramPattern.matcher(baseUrl) - if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start()) - (headerMapF ?: source?.getHeaderMap(true))?.let { - headerMap.putAll(it) - if (it.containsKey("proxy")) { - proxy = it["proxy"] - headerMap.remove("proxy") - } + val urlMatcher = paramPattern.matcher(baseUrl) + if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start()) + (headerMapF ?: source?.getHeaderMap(true))?.let { + headerMap.putAll(it) + if (it.containsKey("proxy")) { + proxy = it["proxy"] + headerMap.remove("proxy") } - initUrl() } + initUrl() } /** From 182cd0e2b7ad0093f6d8d090b9a231b58609288c Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 12 Aug 2022 23:00:41 +0800 Subject: [PATCH 2/2] docs: update RuleHelp md refs: https://github.com/gedoor/legado/pull/2156 --- app/src/main/assets/help/ruleHelp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/assets/help/ruleHelp.md b/app/src/main/assets/help/ruleHelp.md index 9d3c6ade9..e6c1643a4 100644 --- a/app/src/main/assets/help/ruleHelp.md +++ b/app/src/main/assets/help/ruleHelp.md @@ -153,4 +153,4 @@ let options = { * 购买操作 > 返回购买链接,可直接填写链接或者JavaScript -> 可用变量 book chapter \ No newline at end of file +> 可用变量 book chapter java(不支持AnalyzeRule函数) source \ No newline at end of file