优化

2022-10-31 22:08:24 +08:00
parent ffbd212666
commit da689a3c4d
1 changed files with 5 additions and 1 deletions
@@ -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)