pull/1128/head^2
gedoor 3 years ago
parent 68e9ade4ac
commit ef46ae8022
  1. 38
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt

@ -445,37 +445,19 @@ class AnalyzeRule(val ruleData: RuleDataInterface) : JsExtensions {
var tmp: String var tmp: String
val evalMatcher = evalPattern.matcher(rule) val evalMatcher = evalPattern.matcher(rule)
if (evalMatcher.find()) {
var modeX = mode == Mode.Js || mode == Mode.Regex
if (evalMatcher.start() > 0) {
tmp = rule.substring(0, evalMatcher.start())
modeX = modeX || tmp.contains("##")
splitRegex(tmp)
}
if (!modeX) mode = Mode.Regex
tmp = evalMatcher.group()
when {
tmp.startsWith("@get:", true) -> {
ruleType.add(getRuleType)
ruleParam.add(tmp.substring(6, tmp.lastIndex))
}
tmp.startsWith("{{") -> {
ruleType.add(jsRuleType)
ruleParam.add(tmp.substring(2, tmp.length - 2))
}
else -> {
splitRegex(tmp)
}
}
start = evalMatcher.end()
while (evalMatcher.find()) { while (evalMatcher.find()) {
if (evalMatcher.start() > start) { if (evalMatcher.start() > start) {
tmp = rule.substring(start, evalMatcher.start()) tmp = rule.substring(start, evalMatcher.start())
if (mode != Mode.Js && mode != Mode.Regex
&& start == 0 && !tmp.contains("##")
) {
mode = Mode.Regex
}
splitRegex(tmp) splitRegex(tmp)
} else if (mode != Mode.Js && mode != Mode.Regex
&& evalMatcher.start() == 0
) {
mode = Mode.Regex
} }
tmp = evalMatcher.group() tmp = evalMatcher.group()
when { when {
@ -493,8 +475,6 @@ class AnalyzeRule(val ruleData: RuleDataInterface) : JsExtensions {
} }
start = evalMatcher.end() start = evalMatcher.end()
} }
}
if (rule.length > start) { if (rule.length > start) {
tmp = rule.substring(start) tmp = rule.substring(start)
splitRegex(tmp) splitRegex(tmp)

Loading…
Cancel
Save