yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2022-03-05 15:51:52 +08:00
parent aff70919c8 71f34b8819
commit 6a8c7f56b7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/RuleComplete.kt
+3 -3
View File
@@ -10,7 +10,7 @@ object RuleComplete {
private val notComplete = Regex("""^:|^##|\{\{|@js:|<js>|@Json:|\$\.""") private val notComplete = Regex("""^:|^##|\{\{|@js:|<js>|@Json:|\$\.""")
// 修正从图片获取信息 // 修正从图片获取信息
private val fixImgInfo = Regex("""(?<=(^|tag\.|[\+/@>~| &]))img(?<at>\[@?.+\]|\.[-\w]+)?[@/]+text(\(\))?(?<seq>\&{2}|%%|\|{2}|$)""") private val fixImgInfo = Regex("""(?<=(^|tag\.|[\+/@>~| &]))img(?<at>(\[@?.+\]|\.[-\w]+)?)[@/]+text(\(\))?(?<seq>\&{2}|%%|\|{2}|$)""")
private val isXpath= Regex("^//|^@Xpath:") private val isXpath= Regex("^//|^@Xpath:")
@@ -49,10 +49,10 @@ object RuleComplete {
val imgText: String val imgText: String
// 分离尾部规则 // 分离尾部规则
val regexSplit=rules.split("##|,".toRegex(),2) val regexSplit=rules.split("""##|,\{""".toRegex(),2)
val cleanedRule=regexSplit[0] val cleanedRule=regexSplit[0]
if (regexSplit.size>1){ if (regexSplit.size>1){
splitStr="##|,".toRegex().find(rules)?.value ?: "" splitStr="""##|,\{""".toRegex().find(rules)?.value ?: ""
tailStr = splitStr + regexSplit[1] tailStr = splitStr + regexSplit[1]
}else{ }else{
tailStr = "" tailStr = ""