优化

app/src/main/java/io/legado/app/data/entities/BookChapter.kt

@@ -16,6 +16,7 @@ import io.legado.app.help.config.AppConfig
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.model.analyzeRule.RuleDataInterface
 import io.legado.app.utils.*
+import kotlinx.coroutines.CancellationException
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import splitties.init.appCtx
@@ -113,6 +114,8 @@ data class BookChapter(
                     } catch (e: RegexTimeoutException) {
                         item.isEnabled = false
                         appDb.replaceRuleDao.update(item)
+                    } catch (e: CancellationException) {
+                        return displayTitle
                     } catch (e: Exception) {
                         AppLog.put("${item.name}替换出错\n替换内容\n${displayTitle}", e)
                         appCtx.toastOnUi("${item.name}替换出错")

app/src/main/java/io/legado/app/help/ContentProcessor.kt

@@ -12,6 +12,7 @@ import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.utils.msg
 import io.legado.app.utils.replace
 import io.legado.app.utils.toastOnUi
+import kotlinx.coroutines.CancellationException
 import splitties.init.appCtx
 import java.lang.ref.WeakReference
 import java.util.concurrent.CopyOnWriteArrayList
@@ -135,7 +136,7 @@ class ContentProcessor private constructor(
         var mContent = content
         getContentReplaceRules().forEach { item ->
             if (item.pattern.isNotEmpty()) {
-                kotlin.runCatching {
+                try {
                     mContent = if (item.isRegex) {
                         mContent.replace(
                             item.pattern.toRegex(),
@@ -145,18 +146,15 @@ class ContentProcessor private constructor(
                     } else {
                         mContent.replace(item.pattern, item.replacement)
                     }
-                }.onFailure {
+                } catch (e: RegexTimeoutException) {
-                    when (it) {
+                    item.isEnabled = false
-                        is RegexTimeoutException -> {
+                    appDb.replaceRuleDao.update(item)
-                            item.isEnabled = false
+                    return item.name + e.msg
-                            appDb.replaceRuleDao.update(item)
+                } catch (e: CancellationException) {
-                            return item.name + it.msg
+                    return mContent
-                        }
+                } catch (e: Exception) {
-                        else -> {
+                    AppLog.put("${item.name}替换出错\n替换内容\n${mContent}", e)
-                            AppLog.put("${item.name}替换出错\n替换内容\n${mContent}", it)
+                    appCtx.toastOnUi("${item.name}替换出错")
-                            appCtx.toastOnUi("${item.name}替换出错")
-                        }
-                    }
                 }
             }
         }