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

优化

Browse Source
This commit is contained in:
kunfei
2022-10-17 17:38:32 +08:00
parent ba53419994
commit 9791078ac3
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/data/entities/BookChapter.kt
+1 -1
View File
@@ -103,7 +103,7 @@ data class BookChapter(
displayTitle.replaceRegex( displayTitle.replaceRegex(
item.pattern, item.pattern,
item.replacement item.replacement
) ).getOrThrow()
} else { } else {
displayTitle.replace(item.pattern, item.replacement) displayTitle.replace(item.pattern, item.replacement)
} }
app/src/main/java/io/legado/app/help/book/ContentProcessor.kt
+1 -1
View File
@@ -144,7 +144,7 @@ class ContentProcessor private constructor(
mContent.replaceRegex( mContent.replaceRegex(
item.pattern, item.pattern,
item.replacement item.replacement
) ).getOrThrow()
} else { } else {
mContent.replace(item.pattern, item.replacement) mContent.replace(item.pattern, item.replacement)
} }
app/src/main/java/io/legado/app/utils/RegexExtensions.kt
+20 -20
View File
@@ -1,6 +1,5 @@
package io.legado.app.utils package io.legado.app.utils
import android.util.Log
import com.google.re2j.Pattern import com.google.re2j.Pattern
import com.script.SimpleBindings import com.script.SimpleBindings
import io.legado.app.constant.AppConst import io.legado.app.constant.AppConst
@@ -8,26 +7,27 @@ import io.legado.app.constant.AppConst
/** /**
* 带有超时检测的正则替换 * 带有超时检测的正则替换
*/ */
fun CharSequence.replaceRegex(regex: String, replacement: String): String { fun CharSequence.replaceRegex(regex: String, replacement: String): Result<String> {
val charSequence = this return kotlin.runCatching {
val isJs = replacement.startsWith("@js:") val charSequence = this
val replacement1 = if (isJs) replacement.substring(4) else replacement val isJs = replacement.startsWith("@js:")
val pattern = Pattern.compile(regex) val replacement1 = if (isJs) replacement.substring(4) else replacement
val matcher = pattern.matcher(charSequence) val pattern = Pattern.compile(regex)
val stringBuffer = StringBuffer() val matcher = pattern.matcher(charSequence)
while (matcher.find()) { val stringBuffer = StringBuffer()
if (isJs) { while (matcher.find()) {
val bindings = SimpleBindings() if (isJs) {
bindings["result"] = matcher.group() val bindings = SimpleBindings()
val jsResult = bindings["result"] = matcher.group()
AppConst.SCRIPT_ENGINE.eval(replacement1, bindings).toString() val jsResult =
matcher.appendReplacement(stringBuffer, jsResult) AppConst.SCRIPT_ENGINE.eval(replacement1, bindings).toString()
} else { matcher.appendReplacement(stringBuffer, jsResult)
matcher.appendReplacement(stringBuffer, replacement1) } else {
matcher.appendReplacement(stringBuffer, replacement1)
}
} }
matcher.appendTail(stringBuffer)
stringBuffer.toString()
} }
matcher.appendTail(stringBuffer)
Log.e("regex", "end")
return stringBuffer.toString()
} }