From ec207c98e598c891ded2531d7a282fbb5b78952e Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 16 Jan 2023 09:02:55 +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

---
 .../legado/app/help/book/ContentProcessor.kt  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

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 50742354e..7de557396 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
@@ -86,16 +86,25 @@ class ContentProcessor private constructor(
             //去除重复标题
             if (BookHelp.removeSameTitle(book, chapter)) try {
                 val name = Pattern.quote(book.name)
-                val title0 = Pattern.quote(chapter.title)
-                val title1 = Pattern.quote(
-                    chapter.getDisplayTitle(contentReplaceRules, chineseConvert = false)
-                )
-                val titleRegex = "^(\\s|\\p{P}|${name})*(${title0}|${title1})(\\s)*"
-                val matcher = Pattern.compile(titleRegex)
+                var title = Pattern.quote(chapter.title)
+                var matcher = Pattern.compile("^(\\s|\\p{P}|${name})*${title}(\\s)*")
                     .matcher(mContent)
                 if (matcher.find()) {
                     mContent = mContent.substring(matcher.end())
                     sameTitleRemoved = true
+                } else {
+                    title = Pattern.quote(
+                        chapter.getDisplayTitle(
+                            contentReplaceRules,
+                            chineseConvert = false
+                        )
+                    )
+                    matcher = Pattern.compile("^(\\s|\\p{P}|${name})*${title}(\\s)*")
+                        .matcher(mContent)
+                    if (matcher.find()) {
+                        mContent = mContent.substring(matcher.end())
+                        sameTitleRemoved = true
+                    }
                 }
             } catch (e: Exception) {
                 AppLog.put("去除重复标题出错\n${e.localizedMessage}", e)
@@ -143,7 +152,7 @@ class ContentProcessor private constructor(
         return BookContent(sameTitleRemoved, contents)
     }
 
-    suspend fun replaceContent(content: String): String {
+    private suspend fun replaceContent(content: String): String {
         var mContent = content
         mContent = mContent.lines().joinToString("\n") { it.trim() }
         getContentReplaceRules().forEach { item ->