From df83e240749eaca51fb043f97b03c6c57b18461a Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 19 Mar 2023 13:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/api/controller/ReplaceRuleController.kt | 3 ++- app/src/main/java/io/legado/app/data/entities/BookChapter.kt | 2 +- app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt | 1 + app/src/main/java/io/legado/app/help/book/ContentProcessor.kt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/api/controller/ReplaceRuleController.kt b/app/src/main/java/io/legado/app/api/controller/ReplaceRuleController.kt index 2799dd2bc..1f664e9f4 100644 --- a/app/src/main/java/io/legado/app/api/controller/ReplaceRuleController.kt +++ b/app/src/main/java/io/legado/app/api/controller/ReplaceRuleController.kt @@ -80,7 +80,8 @@ object ReplaceRuleController { if (rule.isRegex) { text.replace( rule.pattern.toRegex(), - rule.replacement, rule.timeoutMillisecond + rule.replacement, + rule.getValidTimeoutMillisecond() ) } else { text.replace(rule.pattern, rule.replacement) diff --git a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt index d08b2c1f3..bb8650e3a 100644 --- a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt @@ -103,7 +103,7 @@ data class BookChapter( displayTitle.replace( item.pattern.toRegex(), item.replacement, - item.timeoutMillisecond + item.getValidTimeoutMillisecond() ) } else { displayTitle.replace(item.pattern, item.replacement) diff --git a/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt b/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt index 67a720682..a1243b49b 100644 --- a/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt @@ -88,6 +88,7 @@ data class ReplaceRule( return true } + @Throws(NoStackTraceException::class) fun checkValid() { if (!isValid()) { throw NoStackTraceException(appCtx.getString(R.string.replace_rule_invalid)) diff --git a/app/src/main/java/io/legado/app/help/book/ContentProcessor.kt b/app/src/main/java/io/legado/app/help/book/ContentProcessor.kt index 8706d9b16..f60717f81 100644 --- a/app/src/main/java/io/legado/app/help/book/ContentProcessor.kt +++ b/app/src/main/java/io/legado/app/help/book/ContentProcessor.kt @@ -163,7 +163,7 @@ class ContentProcessor private constructor( mContent.replace( item.pattern.toRegex(), item.replacement, - item.timeoutMillisecond + item.getValidTimeoutMillisecond() ) } else { mContent.replace(item.pattern, item.replacement)