From 243027f4d53cef879552d1c0fab147c41a2b9356 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Tue, 27 Apr 2021 09:58:11 +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/model/webBook/BookContent.kt   | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/webBook/BookContent.kt b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt
index 8eef8d50b..1e55b9e8a 100644
--- a/app/src/main/java/io/legado/app/model/webBook/BookContent.kt
+++ b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt
@@ -13,6 +13,8 @@ import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.utils.HtmlFormatter
 import io.legado.app.utils.NetworkUtils
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
 import splitties.init.appCtx
 
@@ -75,29 +77,26 @@ object BookContent {
             }
             Debug.log(bookSource.bookSourceUrl, "◇本章总页数:${nextUrlList.size}")
         } else if (contentData.nextUrl.size > 1) {
-            val contentDataList = arrayListOf<ContentData<String>>()
-            for (item in contentData.nextUrl) {
-                if (!nextUrlList.contains(item))
-                    contentDataList.add(ContentData(nextUrl = item))
-            }
-            for (item in contentDataList) {
-                withContext(scope.coroutineContext) {
-                    val res = AnalyzeUrl(
-                        ruleUrl = item.nextUrl,
-                        book = book,
-                        headerMapF = bookSource.getHeaderMap()
-                    ).getStrResponse(bookSource.bookSourceUrl)
-                    res.body?.let { nextBody ->
-                        contentData = analyzeContent(
-                            book, item.nextUrl, res.url, nextBody, contentRule,
-                            bookChapter, bookSource, mNextChapterUrl, false
+            Debug.log(bookSource.bookSourceUrl, "◇并发解析目录,总页数:${contentData.nextUrl.size}")
+            withContext(IO) {
+                val asyncArray = Array(contentData.nextUrl.size) {
+                    async(IO) {
+                        val urlStr = contentData.nextUrl[it]
+                        val analyzeUrl = AnalyzeUrl(
+                            ruleUrl = urlStr,
+                            book = book,
+                            headerMapF = bookSource.getHeaderMap()
                         )
-                        item.content = contentData.content
+                        val res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)
+                        analyzeContent(
+                            book, urlStr, res.url, res.body!!, contentRule,
+                            bookChapter, bookSource, mNextChapterUrl, false
+                        ).content
                     }
                 }
-            }
-            for (item in contentDataList) {
-                content.append(item.content).append("\n")
+                asyncArray.forEach { coroutine ->
+                    content.append(coroutine.await()).append("\n")
+                }
             }
         }
         content.deleteCharAt(content.length - 1)