k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
pull/32/head
Administrator 5 years ago
parent 8b0913b571
commit 5854a2182c
2 changed files with 23 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 28
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt
  2. 17
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt

28
app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt
Unescape View File

@ -2,6 +2,7 @@ package io.legado.app.model.analyzeRule
import android.text.TextUtils.isEmpty import android.text.TextUtils.isEmpty
import android.text.TextUtils.join import android.text.TextUtils.join
import io.legado.app.utils.splitNotBlank
import org.jsoup.Jsoup import org.jsoup.Jsoup
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import org.jsoup.select.Collector import org.jsoup.select.Collector
@ -81,15 +82,15 @@ class AnalyzeByJSoup {
when { when {
sourceRule.elementsRule.contains("&&") -> { sourceRule.elementsRule.contains("&&") -> {
elementsType = "&" elementsType = "&"
ruleStrS = sourceRule.elementsRule.split("&&").dropLastWhile { it.isEmpty() }.toTypedArray() ruleStrS = sourceRule.elementsRule.splitNotBlank("&&")
} }
sourceRule.elementsRule.contains("%%") -> { sourceRule.elementsRule.contains("%%") -> {
elementsType = "%" elementsType = "%"
ruleStrS = sourceRule.elementsRule.split("%%").dropLastWhile { it.isEmpty() }.toTypedArray() ruleStrS = sourceRule.elementsRule.splitNotBlank("%%")
} }
else -> { else -> {
elementsType = "|" elementsType = "|"
ruleStrS = sourceRule.elementsRule.split("||").dropLastWhile { it.isEmpty() }.toTypedArray() ruleStrS = sourceRule.elementsRule.splitNotBlank("||")
} }
} }
val results = ArrayList<List<String>>() val results = ArrayList<List<String>>()
@ -144,15 +145,15 @@ class AnalyzeByJSoup {
when { when {
sourceRule.elementsRule.contains("&&") -> { sourceRule.elementsRule.contains("&&") -> {
elementsType = "&" elementsType = "&"
ruleStrS = sourceRule.elementsRule.split("&&").dropLastWhile { it.isEmpty() }.toTypedArray() ruleStrS = sourceRule.elementsRule.splitNotBlank("&&")
} }
sourceRule.elementsRule.contains("%%") -> { sourceRule.elementsRule.contains("%%") -> {
elementsType = "%" elementsType = "%"
ruleStrS = sourceRule.elementsRule.split("%%").dropLastWhile { it.isEmpty() }.toTypedArray() ruleStrS = sourceRule.elementsRule.splitNotBlank("%%")
} }
else -> { else -> {
elementsType = "|" elementsType = "|"
ruleStrS = sourceRule.elementsRule.split("||").dropLastWhile { it.isEmpty() }.toTypedArray() ruleStrS = sourceRule.elementsRule.splitNotBlank("||")
} }
} }
val elementsList = ArrayList<Elements>() val elementsList = ArrayList<Elements>()
@ -215,7 +216,7 @@ class AnalyzeByJSoup {
private fun getElementsSingle(temp: Element, rule: String): Elements { private fun getElementsSingle(temp: Element, rule: String): Elements {
val elements = Elements() val elements = Elements()
try { try {
val rs = rule.trim { it <= ' ' }.split("@").dropLastWhile { it.isEmpty() }.toTypedArray() val rs = rule.trim { it <= ' ' }.splitNotBlank("@")
if (rs.size > 1) { if (rs.size > 1) {
elements.add(temp) elements.add(temp)
for (rl in rs) { for (rl in rs) {
@ -227,16 +228,15 @@ class AnalyzeByJSoup {
elements.addAll(es) elements.addAll(es)
} }
} else { } else {
val rulePcx = rule.split("!").dropLastWhile { it.isEmpty() }.toTypedArray() val rulePcx = rule.splitNotBlank("!")
val rulePc = val rulePc =
rulePcx[0].trim { it <= ' ' }.split(">").dropLastWhile { it.isEmpty() }.toTypedArray() rulePcx[0].trim { it <= ' ' }.splitNotBlank(">")
val rules = val rules =
rulePc[0].trim { it <= ' ' }.split(".").dropLastWhile { it.isEmpty() }.toTypedArray() rulePc[0].trim { it <= ' ' }.splitNotBlank(".")
var filterRules: Array<String>? = null var filterRules: Array<String>? = null
var needFilterElements = rulePc.size > 1 && !isEmpty(rulePc[1].trim { it <= ' ' }) var needFilterElements = rulePc.size > 1 && !isEmpty(rulePc[1].trim { it <= ' ' })
if (needFilterElements) { if (needFilterElements) {
filterRules = rulePc[1].trim { it <= ' ' }.split(".").dropLastWhile { it.isEmpty() } filterRules = rulePc[1].trim { it <= ' ' }.splitNotBlank(".")
.toTypedArray()
filterRules[0] = filterRules[0].trim { it <= ' ' } filterRules[0] = filterRules[0].trim { it <= ' ' }
val validKeys = listOf("class", "id", "tag", "text") val validKeys = listOf("class", "id", "tag", "text")
if (filterRules.size < 2 || !validKeys.contains(filterRules[0]) || isEmpty(filterRules[1].trim { it <= ' ' })) { if (filterRules.size < 2 || !validKeys.contains(filterRules[0]) || isEmpty(filterRules[1].trim { it <= ' ' })) {
@ -305,7 +305,7 @@ class AnalyzeByJSoup {
else -> elements.addAll(temp.select(rulePcx[0])) else -> elements.addAll(temp.select(rulePcx[0]))
} }
if (rulePcx.size > 1) { if (rulePcx.size > 1) {
val rulePcs = rulePcx[1].split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() val rulePcs = rulePcx[1].splitNotBlank(":")
for (pc in rulePcs) { for (pc in rulePcs) {
val pcInt = Integer.parseInt(pc) val pcInt = Integer.parseInt(pc)
if (pcInt < 0 && elements.size + pcInt >= 0) { if (pcInt < 0 && elements.size + pcInt >= 0) {
@ -334,7 +334,7 @@ class AnalyzeByJSoup {
} }
var elements = Elements() var elements = Elements()
elements.add(element) elements.add(element)
val rules = ruleStr.split("@").dropLastWhile { it.isEmpty() }.toTypedArray() val rules = ruleStr.splitNotBlank("@")
for (i in 0 until rules.size - 1) { for (i in 0 until rules.size - 1) {
val es = Elements() val es = Elements()
for (elt in elements) { for (elt in elements) {

17
app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt
Unescape View File

@ -1,6 +1,7 @@
package io.legado.app.model.analyzeRule package io.legado.app.model.analyzeRule
import android.text.TextUtils import android.text.TextUtils
import io.legado.app.utils.splitNotBlank
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.seimicrawler.xpath.JXDocument import org.seimicrawler.xpath.JXDocument
import org.seimicrawler.xpath.JXNode import org.seimicrawler.xpath.JXNode
@ -35,15 +36,15 @@ class AnalyzeByXPath {
val rules: Array<String> val rules: Array<String>
when { when {
xPath.contains("&&") -> { xPath.contains("&&") -> {
rules = xPath.split("&&").dropLastWhile { it.isEmpty() }.toTypedArray() rules = xPath.splitNotBlank("&&")
elementsType = "&" elementsType = "&"
} }
xPath.contains("%%") -> { xPath.contains("%%") -> {
rules = xPath.split("%%").dropLastWhile { it.isEmpty() }.toTypedArray() rules = xPath.splitNotBlank("%%")
elementsType = "%" elementsType = "%"
} }
else -> { else -> {
rules = xPath.split("||").dropLastWhile { it.isEmpty() }.toTypedArray() rules = xPath.splitNotBlank("||")
elementsType = "|" elementsType = "|"
} }
} }
@ -85,15 +86,15 @@ class AnalyzeByXPath {
val rules: Array<String> val rules: Array<String>
when { when {
xPath.contains("&&") -> { xPath.contains("&&") -> {
rules = xPath.split("&&").dropLastWhile { it.isEmpty() }.toTypedArray() rules = xPath.splitNotBlank("&&")
elementsType = "&" elementsType = "&"
} }
xPath.contains("%%") -> { xPath.contains("%%") -> {
rules = xPath.split("%%").dropLastWhile { it.isEmpty() }.toTypedArray() rules = xPath.splitNotBlank("%%")
elementsType = "%" elementsType = "%"
} }
else -> { else -> {
rules = xPath.split("||").dropLastWhile { it.isEmpty() }.toTypedArray() rules = xPath.splitNotBlank("||")
elementsType = "|" elementsType = "|"
} }
} }
@ -140,10 +141,10 @@ class AnalyzeByXPath {
val rules: Array<String> val rules: Array<String>
val elementsType: String val elementsType: String
if (rule.contains("&&")) { if (rule.contains("&&")) {
rules = rule.split("&&").dropLastWhile { it.isEmpty() }.toTypedArray() rules = rule.splitNotBlank("&&")
elementsType = "&" elementsType = "&"
} else { } else {
rules = rule.split("||").dropLastWhile { it.isEmpty() }.toTypedArray() rules = rule.splitNotBlank("||")
elementsType = "|" elementsType = "|"
} }
if (rules.size == 1) { if (rules.size == 1) {

Write Preview
Loading…
Cancel
Save