Merge branch 'master' of https://github.com/gedoor/legado

app/build.gradle

@@ -166,7 +166,7 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.13.1'
     //noinspection GradleDependency
     implementation 'cn.wanghaomiao:JsoupXpath:2.3.2'
-    implementation 'com.jayway.jsonpath:json-path:2.4.0'
+    implementation 'com.jayway.jsonpath:json-path:2.5.0'
 
     //JS rhino
     implementation 'com.github.gedoor:rhino-android:1.4'

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt

@@ -163,7 +163,7 @@ class AnalyzeRule(var book: BaseBook? = null) : JsExtensions {
             if (result is List<*>) {
                 for (url in result as List<*>) {
                     val absoluteURL = NetworkUtils.getAbsoluteURL(baseURL, url.toString())
-                    if (!absoluteURL.isNullOrEmpty() && !urlList.contains(absoluteURL)) {
+                    if (absoluteURL.isNotEmpty() && !urlList.contains(absoluteURL)) {
                         urlList.add(absoluteURL)
                     }
                 }
@@ -231,7 +231,7 @@ class AnalyzeRule(var book: BaseBook? = null) : JsExtensions {
             return if (str.isBlank()) {
                 baseUrl ?: ""
             } else {
-                NetworkUtils.getAbsoluteURL(baseURL, str) ?: ""
+                NetworkUtils.getAbsoluteURL(baseURL, str)
             }
         }
         return str
@@ -573,8 +573,8 @@ class AnalyzeRule(var book: BaseBook? = null) : JsExtensions {
                 rule = infoVal.toString()
             }
             //分离正则表达式
-            val ruleStrS = rule.trim { it <= ' ' }.split("##")
-            rule = ruleStrS[0]
+            val ruleStrS = rule.split("##")
+            rule = ruleStrS[0].trim()
             if (ruleStrS.size > 1) {
                 replaceRegex = ruleStrS[1]
             }