From 298a824d0cdb4610d1750837a517003bd153af48 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Sat, 30 Sep 2023 22:20:38 +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/help/book/BookHelp.kt  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/book/BookHelp.kt b/app/src/main/java/io/legado/app/help/book/BookHelp.kt
index 5cf998a2a..e6ca85370 100644
--- a/app/src/main/java/io/legado/app/help/book/BookHelp.kt
+++ b/app/src/main/java/io/legado/app/help/book/BookHelp.kt
@@ -73,8 +73,8 @@ object BookHelp {
      */
     suspend fun clearInvalidCache() {
         withContext(IO) {
-            val bookFolderNames = ArrayList<String>()
-            val originNames = ArrayList<String>()
+            val bookFolderNames = hashSetOf<String>()
+            val originNames = hashSetOf<String>()
             appDb.bookDao.all.forEach {
                 bookFolderNames.add(it.getFolderName())
                 if (it.isEpub) originNames.add(it.originName)
@@ -260,7 +260,9 @@ object BookHelp {
      * 检测该章节是否下载
      */
     fun hasContent(book: Book, bookChapter: BookChapter): Boolean {
-        return if (book.isLocalTxt) {
+        return if (book.isLocalTxt
+            || (bookChapter.isVolume && bookChapter.url.startsWith(bookChapter.title))
+        ) {
             true
         } else {
             downloadDir.exists(
@@ -290,11 +292,11 @@ object BookHelp {
                     ret = false
                     continue
                 }
-                if (SvgUtils.getSize(image.absolutePath) != null) {
-                    continue
-                }
                 BitmapFactory.decodeFile(image.absolutePath, op)
                 if (op.outWidth < 1 && op.outHeight < 1) {
+                    if (SvgUtils.getSize(image.absolutePath) != null) {
+                        continue
+                    }
                     ret = false
                     image.delete()
                 }
@@ -304,14 +306,11 @@ object BookHelp {
     }
 
     private fun checkImage(bytes: ByteArray): Boolean {
-        if (SvgUtils.getSize(ByteArrayInputStream(bytes)) != null) {
-            return true
-        }
         val op = BitmapFactory.Options()
         op.inJustDecodeBounds = true
         BitmapFactory.decodeByteArray(bytes, 0, bytes.size, op)
         if (op.outWidth < 1 && op.outHeight < 1) {
-            return false
+            return SvgUtils.getSize(ByteArrayInputStream(bytes)) != null
         }
         return true
     }
@@ -488,7 +487,6 @@ object BookHelp {
         )
     }
 
-    @Suppress("SpellCheckingInspection")
     private val regexOther by lazy {
         // 所有非字母数字中日韩文字 CJK区+扩展A-F区
         @Suppress("RegExpDuplicateCharacterInClass")