Merge remote-tracking branch 'origin/master'

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

@@ -237,6 +237,5 @@ object BookHelp {
         }
         return c
             .replace("\\s*\\n+\\s*".toRegex(), "\n${ReadBookConfig.bodyIndent}")
-            .replace("[\\n\\s]+$".toRegex(), "") //移除尾部空行
     }
 }

app/src/main/java/io/legado/app/help/storage/OldRule.kt

@@ -19,7 +19,7 @@ object OldRule {
             source = GSON.fromJsonObject<BookSource>(json.trim())
         }
         runCatching {
-            if (source == null || source?.searchUrl.isNullOrBlank()) {
+            if (source == null || source?.ruleToc.isNullOrBlank()) {
                 source = BookSource().apply {
                     val jsonItem = jsonPath.parse(json.trim())
                     bookSourceUrl = jsonItem.readString("bookSourceUrl") ?: ""

app/src/main/java/io/legado/app/model/webBook/BookContent.kt

@@ -101,6 +101,7 @@ object BookContent {
             }
         }
 
+        content.deleteCharAt(content.length - 1)
         Debug.log(bookSource.bookSourceUrl, "┌获取章节名称")
         Debug.log(bookSource.bookSourceUrl, "└${bookChapter.title}")
         Debug.log(bookSource.bookSourceUrl, "┌获取正文内容")