Update RuleAnalyzer.kt

优化排版
pull/1108/head
bushixuanqi 4 years ago committed by GitHub
parent 408fb77019
commit 47aa7095b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 25
      app/src/main/java/io/legado/app/model/analyzeRule/RuleAnalyzer.kt

@ -266,13 +266,13 @@ class RuleAnalyzer(data: String, code:Boolean = false) {
this.pos = pos //同步位置
true
}
}
}
/**
/**
* 不用正则,不到最后不切片也不用中间变量存储,只在序列中标记当前查找字段的开头结尾,到返回时才切片,高效快速准确切割规则
* 解决jsonPath自带的"&&""||"与阅读的规则冲突,以及规则正则或字符串中包含"&&""||""%%""@"导致的冲突
*/
tailrec fun splitRule(vararg split: String): Array<String>{ //首段匹配,elementsType为空
tailrec fun splitRule(vararg split: String): Array<String>{ //首段匹配,elementsType为空
if(split.size == 1) {
elementsType = split[0] //设置分割字串
@ -348,10 +348,10 @@ tailrec fun splitRule(vararg split: String): Array<String>{ //首段匹配,eleme
start = pos //设置开始查找筛选器位置的起始位置
return splitRule(* split) //递归调用首段匹配
}
}
@JvmName("splitRuleNext")
private tailrec fun splitRule(): Array<String>{ //二段匹配被调用,elementsType非空(已在首段赋值),直接按elementsType查找,比首段采用的方式更快
@JvmName("splitRuleNext")
private tailrec fun splitRule(): Array<String>{ //二段匹配被调用,elementsType非空(已在首段赋值),直接按elementsType查找,比首段采用的方式更快
val end = pos //记录分隔位置
pos = start //重回开始,启动另一种查找
@ -413,10 +413,10 @@ private tailrec fun splitRule(): Array<String>{ //二段匹配被调用,elements
rule
}else splitRule() //递归匹配
}
}
/**
/**
* 替换内嵌规则
* @param inner 起始标志,{$. {{
* @param startStep 不属于规则部分的前置字符长度{$.{不属于规则的组成部分故startStep为1
@ -424,7 +424,7 @@ private tailrec fun splitRule(): Array<String>{ //二段匹配被调用,elements
* @param fr 查找到内嵌规则时用于解析的函数
*
* */
fun innerRule( inner:String,startStep:Int = 1,endStep:Int = 1,fr:(String)->String?): String {
fun innerRule( inner:String,startStep:Int = 1,endStep:Int = 1,fr:(String)->String?): String {
val start0 = pos //规则匹配前起点
@ -450,7 +450,7 @@ fun innerRule( inner:String,startStep:Int = 1,endStep:Int = 1,fr:(String)->Strin
st.append(remainingString()) //压入剩余字符串
st.toString()
}
}
}
// /**
// * 匹配并返回标签中的属性键字串(字母、数字、-、_、:)
@ -485,7 +485,7 @@ fun innerRule( inner:String,startStep:Int = 1,endStep:Int = 1,fr:(String)->Strin
// return query
// }
companion object {
companion object {
/**
* 转义字符
*/
@ -564,4 +564,5 @@ companion object {
*/
val splitListDefault = arrayOf("-",".","!","@","@@")
}}
}
}

Loading…
Cancel
Save