Merge pull request #2158 from Xwite/master

'fix(AnalyzeUrl): skip analyze when mUrl is DataURL'

app/src/main/assets/help/ruleHelp.md

@@ -153,4 +153,4 @@ let options = {
 
 * 购买操作
 > 返回购买链接，可直接填写链接或者JavaScript  
-> 可用变量 book chapter
+> 可用变量 book chapter java(不支持AnalyzeRule函数) source

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)
-            val urlMatcher = paramPattern.matcher(baseUrl)
+        if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start())
-            if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start())
+        (headerMapF ?: source?.getHeaderMap(true))?.let {
-            (headerMapF ?: source?.getHeaderMap(true))?.let {
+            headerMap.putAll(it)
-                headerMap.putAll(it)
+            if (it.containsKey("proxy")) {
-                if (it.containsKey("proxy")) {
+                proxy = it["proxy"]
-                    proxy = it["proxy"]
+                headerMap.remove("proxy")
-                    headerMap.remove("proxy")
-                }
             }
-            initUrl()
         }
+        initUrl()
     }
 
     /**