From fc2e37d113fd7a4220b065803e03dd07df6ccb3a Mon Sep 17 00:00:00 2001
From: bushixuanqi <2208877960@qq.com>
Date: Sat, 17 Jul 2021 04:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=93=BE=E6=8E=A5=E5=88=86?=
 =?UTF-8?q?=E5=89=B2=E8=A7=84=E5=88=99=EF=BC=8C=E9=81=BF=E5=85=8D=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0=E4=B8=AD=E5=AD=98=E5=9C=A8=20,{=20?=
 =?UTF-8?q?=E6=97=B6=E5=AF=BC=E8=87=B4=E8=A7=84=E5=88=99=E5=88=87=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复<str0,str2,...{{js}}>这种页数列表写法中，js部分内含 < 或 > 会切割错误的问题

格式化图片和匹配图片规则不在使用同一个正则，加快图片处理速度。

优化一下不需要循环执行却被循环执行的操作
---
 .../read/page/provider/ChapterProvider.kt     | 37 ++++++++++---------
 .../java/io/legado/app/utils/HtmlFormatter.kt | 14 ++++---
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
index 59a074985..494f628a4 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
@@ -111,26 +111,27 @@ object ChapterProvider {
                     )
                 }
             } else if (book.getImageStyle() != Book.imgStyleText) {
-                content.replace(AppPattern.imgPattern.toRegex(), "\n\$0\n")
-                    .split("\n").forEach { text ->
-                        if (text.isNotBlank()) {
-                            if (!text.startsWith("<img src=\"")) { //非图片
-                                val isTitle = index == 0
-                                val textPaint = if (isTitle) titlePaint else contentPaint
-                                if (!(isTitle && ReadBookConfig.titleMode == 2)) {
-                                    durY = setTypeText(
-                                        text, durY, textPages,
-                                        stringBuilder, isTitle, textPaint
-                                    )
-                                }
-                            } else { //图片
-                                durY = setTypeImage(
-                                    book, bookChapter, text.substring(10, text.length-2),
-                                    durY, textPages, book.getImageStyle()
-                                )
-                            }
+                var contentX = content.replace(AppPattern.imgPattern.toRegex(), "\n\$0\n").split("\n")
+                val start = contentX.first() == "\n"
+                val end = contentX.last() == "\n"
+                if(start || end )contentX = contentX.subList(if(start) 1 else 0,if(end) contentX.size-1 else contentX.size )
+                contentX.forEach { text ->
+                    if (!text.startsWith("<img src=\"")) { //非图片
+                        val isTitle = index == 0
+                        val textPaint = if (isTitle) titlePaint else contentPaint
+                        if (!(isTitle && ReadBookConfig.titleMode == 2)) {
+                            durY = setTypeText(
+                                text, durY, textPages,
+                                stringBuilder, isTitle, textPaint
+                            )
                         }
+                    } else { //图片
+                        durY = setTypeImage(
+                            book, bookChapter, text.substring(10, text.length-2),
+                            durY, textPages, book.getImageStyle()
+                        )
                     }
+                }
             }
         }
         textPages.last().height = durY + 20.dp
diff --git a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
index b4ed4e83e..5f69f5b9f 100644
--- a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
+++ b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
@@ -59,16 +59,17 @@ object HtmlFormatter {
 
                 do{
                     val url = matcher.group(1)!!
-                    val pos = url.indexOf(',')
-                    sb.append(keepImgHtml.substring(appendPos, matcher.start()).replace("\n","\n　　")) //非图片部分换行缩减
+                    val urlBefore = url.substringBefore(',')
+                    val beforeStr = keepImgHtml.substring(appendPos, matcher.start())
+                    sb.append( if(beforeStr == "\n") '\n' else beforeStr.replace("\n","\n　　") ) //缩进换行下个非图片段落
                     sb.append(
                         "<img src=\"${
                             NetworkUtils.getAbsoluteURL(
                                 redirectUrl,
-                                url.substring(0, pos)
+                                urlBefore
                             )
-                        },${
-                            url.substring(pos + 1 )
+                        }${
+                            url.substring(urlBefore.length)
                         }\">"
                     )
                     appendPos = matcher.end()
@@ -78,7 +79,8 @@ object HtmlFormatter {
         }
 
         if (appendPos < keepImgHtml.length) {
-            sb.append(keepImgHtml.substring(appendPos, keepImgHtml.length).replace("\n","\n　　")) //非图片部分换行缩减
+            val beforeStr = keepImgHtml.substring(appendPos, keepImgHtml.length)
+            sb.append( if(beforeStr == "\n") '\n' else beforeStr.replace("\n","\n　　") ) //缩进换行下个非图片段落
         }
         return sb.toString()
     }