From 89caa35e47295e0255fd48dbae43302adb9c3c11 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Fri, 15 Dec 2023 15:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/analyzeRule/AnalyzeByJSonPath.kt | 10 +- .../app/model/analyzeRule/AnalyzeByJSoup.kt | 4 +- .../app/model/analyzeRule/AnalyzeByRegex.kt | 4 +- .../app/model/analyzeRule/AnalyzeByXPath.kt | 14 +- .../app/model/analyzeRule/AnalyzeRule.kt | 238 +++++++++--------- 5 files changed, 140 insertions(+), 130 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt index dc39ea201..71d9006ce 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt @@ -28,8 +28,8 @@ class AnalyzeByJSonPath(json: Any) { * 解决阅读”&&“、”||“与jsonPath支持的”&&“、”||“之间的冲突 * 解决{$.rule}形式规则可能匹配错误的问题，旧规则用正则解析内容含‘}’的json文本时，用规则中的字段去匹配这种内容会匹配错误.现改用平衡嵌套方法解决这个问题 * */ - fun getString(rule: String): String { - if (rule.isEmpty()) return "" + fun getString(rule: String): String? { + if (rule.isEmpty()) return null var result: String val ruleAnalyzes = RuleAnalyzer(rule, true) //设置平衡组为代码平衡 val rules = ruleAnalyzes.splitRule("&&", "||") @@ -57,7 +57,7 @@ class AnalyzeByJSonPath(json: Any) { val textList = arrayListOf() for (rl in rules) { val temp = getString(rl) - if (temp.isNotEmpty()) { + if (!temp.isNullOrEmpty()) { textList.add(temp) if (ruleAnalyzes.elementsType == "||") { break @@ -126,7 +126,7 @@ class AnalyzeByJSonPath(json: Any) { return ctx.read(rule) } - internal fun getList(rule: String): ArrayList { + internal fun getList(rule: String): ArrayList? { val result = ArrayList() if (rule.isEmpty()) return result val ruleAnalyzes = RuleAnalyzer(rule, true) //设置平衡组为代码平衡 @@ -143,7 +143,7 @@ class AnalyzeByJSonPath(json: Any) { val results = ArrayList>() for (rl in rules) { val temp = getList(rl) - if (temp.isNotEmpty()) { + if (!temp.isNullOrEmpty()) { results.add(temp) if (temp.isNotEmpty() && ruleAnalyzes.elementsType == "||") { break diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt index b758782d4..4963df95f 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt @@ -42,8 +42,8 @@ class AnalyzeByJSoup(doc: Any) { * 合并内容列表,得到内容 */ internal fun getString(ruleStr: String) = - if (ruleStr.isEmpty()) "" - else getStringList(ruleStr).takeIf { it.isNotEmpty() }?.joinToString("\n") ?: "" + if (ruleStr.isEmpty()) null + else getStringList(ruleStr).takeIf { it.isNotEmpty() }?.joinToString("\n") /** * 获取一个字符串 diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt index c0dd2519c..7e41eba6a 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt @@ -6,11 +6,11 @@ import java.util.regex.Pattern @Keep object AnalyzeByRegex { - fun getElement(res: String, regs: Array, index: Int = 0): List { + fun getElement(res: String, regs: Array, index: Int = 0): List? { var vIndex = index val resM = Pattern.compile(regs[vIndex]).matcher(res) if (!resM.find()) { - return emptyList() + return null } // 判断索引的规则是最后一个规则 return if (vIndex + 1 == regs.size) { diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt index 2421b0764..b0d52cf3a 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt @@ -49,21 +49,21 @@ class AnalyzeByXPath(doc: Any) { } } - internal fun getElements(xPath: String): List { + internal fun getElements(xPath: String): List? { - if (xPath.isEmpty()) return emptyList() + if (xPath.isEmpty()) return null val jxNodes = ArrayList() val ruleAnalyzes = RuleAnalyzer(xPath) val rules = ruleAnalyzes.splitRule("&&", "||", "%%") if (rules.size == 1) { - return getResult(rules[0]) ?: emptyList() + return getResult(rules[0]) } else { val results = ArrayList>() for (rl in rules) { val temp = getElements(rl) - if (temp.isNotEmpty()) { + if (!temp.isNullOrEmpty()) { results.add(temp) if (temp.isNotEmpty() && ruleAnalyzes.elementsType == "||") { break @@ -130,19 +130,19 @@ class AnalyzeByXPath(doc: Any) { return result } - fun getString(rule: String): String { + fun getString(rule: String): String? { val ruleAnalyzes = RuleAnalyzer(rule) val rules = ruleAnalyzes.splitRule("&&", "||") if (rules.size == 1) { getResult(rule)?.let { return TextUtils.join("\n", it) } - return "" + return null } else { val textList = arrayListOf() for (rl in rules) { val temp = getString(rl) - if (temp.isNotEmpty()) { + if (!temp.isNullOrEmpty()) { textList.add(temp) if (ruleAnalyzes.elementsType == "||") { break diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt index 82e37feb7..d3da68e1a 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt @@ -140,58 +140,58 @@ class AnalyzeRule( mContent: Any? = null, isUrl: Boolean = false ): List? { + var result: Any? = null val content = mContent ?: this.content - if (content == null || ruleList.isEmpty()) { - return null - } - var result: Any = content - if (result is NativeObject) { - val sourceRule = ruleList.first() - putRule(sourceRule.putMap) - sourceRule.makeUpRule(result) - result = if (sourceRule.getParamSize() > 1) { - // get {{}} - sourceRule.rule - } else { - // 键值直接访问 - result[sourceRule.rule] ?: emptyList() - } - if (sourceRule.replaceRegex.isNotEmpty() && result is List<*>) { - result = result.map { - replaceRegex(it.toString(), sourceRule) - } - } else if (sourceRule.replaceRegex.isNotEmpty()) { - result = replaceRegex(result.toString(), sourceRule) - } - } else { - for (sourceRule in ruleList) { + if (content != null && ruleList.isNotEmpty()) { + result = content + if (result is NativeObject) { + val sourceRule = ruleList.first() putRule(sourceRule.putMap) sourceRule.makeUpRule(result) - if (sourceRule.rule.isNotEmpty()) { - result = when (sourceRule.mode) { - Mode.Js -> evalJS(sourceRule.rule, result) ?: "null" - Mode.Json -> getAnalyzeByJSonPath(result).getStringList(sourceRule.rule) - Mode.XPath -> getAnalyzeByXPath(result).getStringList(sourceRule.rule) - Mode.Default -> getAnalyzeByJSoup(result).getStringList(sourceRule.rule) - else -> sourceRule.rule - } + result = if (sourceRule.getParamSize() > 1) { + // get {{}} + sourceRule.rule + } else { + // 键值直接访问 + result[sourceRule.rule] + }?.let { + replaceRegex(it.toString(), sourceRule) } - if (sourceRule.replaceRegex.isNotEmpty() && result is List<*>) { - result = result.map { - replaceRegex(it.toString(), sourceRule) + } else { + for (sourceRule in ruleList) { + putRule(sourceRule.putMap) + sourceRule.makeUpRule(result) + result?.let { + if (sourceRule.rule.isNotEmpty()) { + result = when (sourceRule.mode) { + Mode.Js -> evalJS(sourceRule.rule, result) + Mode.Json -> getAnalyzeByJSonPath(it).getStringList(sourceRule.rule) + Mode.XPath -> getAnalyzeByXPath(it).getStringList(sourceRule.rule) + Mode.Default -> getAnalyzeByJSoup(it).getStringList(sourceRule.rule) + else -> sourceRule.rule + } + } + if (sourceRule.replaceRegex.isNotEmpty() && result is List<*>) { + val newList = ArrayList() + for (item in result as List<*>) { + newList.add(replaceRegex(item.toString(), sourceRule)) + } + result = newList + } else if (sourceRule.replaceRegex.isNotEmpty()) { + result = replaceRegex(result.toString(), sourceRule) + } } - } else if (sourceRule.replaceRegex.isNotEmpty()) { - result = replaceRegex(result.toString(), sourceRule) } } } + if (result == null) return null if (result is String) { - result = result.split("\n") + result = (result as String).split("\n") } if (isUrl) { val urlList = ArrayList() if (result is List<*>) { - for (url in result) { + for (url in result as List<*>) { val absoluteURL = NetworkUtils.getAbsoluteURL(redirectUrl, url.toString()) if (absoluteURL.isNotEmpty() && !urlList.contains(absoluteURL)) { urlList.add(absoluteURL) @@ -227,47 +227,50 @@ class AnalyzeRule( isUrl: Boolean = false, unescape: Boolean = true ): String { + var result: Any? = null val content = mContent ?: this.content - if (content == null || ruleList.isEmpty()) { - return if (isUrl) baseUrl ?: "" else "" - } - var result: Any = content - if (result is NativeObject) { - val sourceRule = ruleList.first() - putRule(sourceRule.putMap) - sourceRule.makeUpRule(result) - result = (if (sourceRule.getParamSize() > 1) { - // get {{}} - sourceRule.rule - } else { - // 键值直接访问 - result[sourceRule.rule]?.toString() ?: "" - }).let { - replaceRegex(it, sourceRule) - } - } else { - for (sourceRule in ruleList) { + if (content != null && ruleList.isNotEmpty()) { + result = content + if (result is NativeObject) { + val sourceRule = ruleList.first() putRule(sourceRule.putMap) sourceRule.makeUpRule(result) - if (sourceRule.rule.isNotBlank() || sourceRule.replaceRegex.isEmpty()) { - result = when (sourceRule.mode) { - Mode.Js -> evalJS(sourceRule.rule, result) ?: "" - Mode.Json -> getAnalyzeByJSonPath(result).getString(sourceRule.rule) - Mode.XPath -> getAnalyzeByXPath(result).getString(sourceRule.rule) - Mode.Default -> if (isUrl) { - getAnalyzeByJSoup(result).getString0(sourceRule.rule) - } else { - getAnalyzeByJSoup(result).getString(sourceRule.rule) - } - - else -> sourceRule.rule - } + result = if (sourceRule.getParamSize() > 1) { + // get {{}} + sourceRule.rule + } else { + // 键值直接访问 + result[sourceRule.rule]?.toString() + }?.let { + replaceRegex(it, sourceRule) } - if (sourceRule.replaceRegex.isNotEmpty()) { - result = replaceRegex(result.toString(), sourceRule) + } else { + for (sourceRule in ruleList) { + putRule(sourceRule.putMap) + sourceRule.makeUpRule(result) + result?.let { + if (sourceRule.rule.isNotBlank() || sourceRule.replaceRegex.isEmpty()) { + result = when (sourceRule.mode) { + Mode.Js -> evalJS(sourceRule.rule, it) + Mode.Json -> getAnalyzeByJSonPath(it).getString(sourceRule.rule) + Mode.XPath -> getAnalyzeByXPath(it).getString(sourceRule.rule) + Mode.Default -> if (isUrl) { + getAnalyzeByJSoup(it).getString0(sourceRule.rule) + } else { + getAnalyzeByJSoup(it).getString(sourceRule.rule) + } + + else -> sourceRule.rule + } + } + if ((result != null) && sourceRule.replaceRegex.isNotEmpty()) { + result = replaceRegex(result.toString(), sourceRule) + } + } } } } + if (result == null) result = "" val str = if (unescape) { StringEscapeUtils.unescapeHtml4(result.toString()) } else result.toString() @@ -286,28 +289,30 @@ class AnalyzeRule( */ fun getElement(ruleStr: String): Any? { if (TextUtils.isEmpty(ruleStr)) return null - val content = this.content ?: return null + var result: Any? = null + val content = this.content val ruleList = splitSourceRule(ruleStr, true) - if (ruleList.isEmpty()) { - return null - } - var result = content - for (sourceRule in ruleList) { - putRule(sourceRule.putMap) - sourceRule.makeUpRule(result) - result = when (sourceRule.mode) { - Mode.Regex -> AnalyzeByRegex.getElement( - result.toString(), - sourceRule.rule.splitNotBlank("&&") - ) + if (content != null && ruleList.isNotEmpty()) { + result = content + for (sourceRule in ruleList) { + putRule(sourceRule.putMap) + sourceRule.makeUpRule(result) + result?.let { + result = when (sourceRule.mode) { + Mode.Regex -> AnalyzeByRegex.getElement( + result.toString(), + sourceRule.rule.splitNotBlank("&&") + ) - Mode.Js -> evalJS(sourceRule.rule, result) ?: Any() - Mode.Json -> getAnalyzeByJSonPath(result).getObject(sourceRule.rule) - Mode.XPath -> getAnalyzeByXPath(result).getElements(sourceRule.rule) - else -> getAnalyzeByJSoup(result).getElements(sourceRule.rule) - } - if (sourceRule.replaceRegex.isNotEmpty()) { - result = replaceRegex(result.toString(), sourceRule) + Mode.Js -> evalJS(sourceRule.rule, it) + Mode.Json -> getAnalyzeByJSonPath(it).getObject(sourceRule.rule) + Mode.XPath -> getAnalyzeByXPath(it).getElements(sourceRule.rule) + else -> getAnalyzeByJSoup(it).getElements(sourceRule.rule) + } + if (sourceRule.replaceRegex.isNotEmpty()) { + result = replaceRegex(result.toString(), sourceRule) + } + } } } return result @@ -318,30 +323,35 @@ class AnalyzeRule( */ @Suppress("UNCHECKED_CAST") fun getElements(ruleStr: String): List { - val content = this.content ?: return emptyList() + var result: Any? = null + val content = this.content val ruleList = splitSourceRule(ruleStr, true) - if (ruleList.isEmpty()) { - return emptyList() - } - var result = content - for (sourceRule in ruleList) { - putRule(sourceRule.putMap) - result = when (sourceRule.mode) { - Mode.Regex -> AnalyzeByRegex.getElements( - result.toString(), - sourceRule.rule.splitNotBlank("&&") - ) + if (content != null && ruleList.isNotEmpty()) { + result = content + for (sourceRule in ruleList) { + putRule(sourceRule.putMap) + result?.let { + result = when (sourceRule.mode) { + Mode.Regex -> AnalyzeByRegex.getElements( + result.toString(), + sourceRule.rule.splitNotBlank("&&") + ) - Mode.Js -> evalJS(sourceRule.rule, result) ?: emptyList() - Mode.Json -> getAnalyzeByJSonPath(result).getList(sourceRule.rule) - Mode.XPath -> getAnalyzeByXPath(result).getElements(sourceRule.rule) - else -> getAnalyzeByJSoup(result).getElements(sourceRule.rule) - } - if (sourceRule.replaceRegex.isNotEmpty()) { - result = replaceRegex(result.toString(), sourceRule) + Mode.Js -> evalJS(sourceRule.rule, result) + Mode.Json -> getAnalyzeByJSonPath(it).getList(sourceRule.rule) + Mode.XPath -> getAnalyzeByXPath(it).getElements(sourceRule.rule) + else -> getAnalyzeByJSoup(it).getElements(sourceRule.rule) + } + if (sourceRule.replaceRegex.isNotEmpty()) { + result = replaceRegex(result.toString(), sourceRule) + } + } } } - return result as List + result?.let { + return it as List + } + return ArrayList() } /** @@ -403,7 +413,7 @@ class AnalyzeRule( /** * getString 类规则缓存 */ - fun splitSourceRuleCacheString(ruleStr: String?): List { + fun splitSourceRuleCacheString(ruleStr: String?) : List { if (ruleStr.isNullOrEmpty()) return emptyList() val cacheRule = stringRuleCache[ruleStr] return if (cacheRule != null) {