This commit is contained in:
kunfei
2022-10-17 20:19:10 +08:00
parent 4cd786c698
commit a72e94522a
2 changed files with 6 additions and 3 deletions
@@ -102,7 +102,8 @@ data class BookChapter(
val mDisplayTitle = if (item.isRegex) { val mDisplayTitle = if (item.isRegex) {
displayTitle.replace( displayTitle.replace(
item.pattern.toRegex(), item.pattern.toRegex(),
item.replacement item.replacement,
item.timeoutMillisecond
) )
} else { } else {
displayTitle.replace(item.pattern, item.replacement) displayTitle.replace(item.pattern, item.replacement)
@@ -9,6 +9,7 @@ import io.legado.app.data.entities.ReplaceRule
import io.legado.app.exception.RegexTimeoutException import io.legado.app.exception.RegexTimeoutException
import io.legado.app.help.config.AppConfig import io.legado.app.help.config.AppConfig
import io.legado.app.help.config.ReadBookConfig import io.legado.app.help.config.ReadBookConfig
import io.legado.app.utils.replace
import io.legado.app.utils.stackTraceStr import io.legado.app.utils.stackTraceStr
import io.legado.app.utils.toastOnUi import io.legado.app.utils.toastOnUi
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
@@ -133,7 +134,7 @@ class ContentProcessor private constructor(
return contents return contents
} }
fun replaceContent(content: String): String { suspend fun replaceContent(content: String): String {
var mContent = content var mContent = content
mContent = mContent.lines().joinToString("\n") { it.trim() } mContent = mContent.lines().joinToString("\n") { it.trim() }
getContentReplaceRules().forEach { item -> getContentReplaceRules().forEach { item ->
@@ -142,7 +143,8 @@ class ContentProcessor private constructor(
mContent = if (item.isRegex) { mContent = if (item.isRegex) {
mContent.replace( mContent.replace(
item.pattern.toRegex(), item.pattern.toRegex(),
item.replacement item.replacement,
item.timeoutMillisecond
) )
} else { } else {
mContent.replace(item.pattern, item.replacement) mContent.replace(item.pattern, item.replacement)