From 8823a8a7afa5168093a520c7f8eb361b9859213e Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Sat, 27 Feb 2021 15:25:37 +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/model/webBook/BookInfo.kt |  5 +++--
 .../java/io/legado/app/model/webBook/BookList.kt | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt
index e4ee6cdbd..febe122d8 100644
--- a/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt
+++ b/app/src/main/java/io/legado/app/model/webBook/BookInfo.kt
@@ -32,12 +32,13 @@ object BookInfo {
         val analyzeRule = AnalyzeRule(book)
         analyzeRule.setContent(body).setBaseUrl(baseUrl)
         analyzeRule.setRedirectUrl(redirectUrl)
-        analyzeBookInfo(scope, book, analyzeRule, bookSource, baseUrl, redirectUrl, canReName)
+        analyzeBookInfo(scope, book, body, analyzeRule, bookSource, baseUrl, redirectUrl, canReName)
     }
 
     fun analyzeBookInfo(
         scope: CoroutineScope,
         book: Book,
+        body: String,
         analyzeRule: AnalyzeRule,
         bookSource: BookSource,
         baseUrl: String,
@@ -106,7 +107,7 @@ object BookInfo {
         book.tocUrl = analyzeRule.getString(infoRule.tocUrl, true)
         if (book.tocUrl.isEmpty()) book.tocUrl = baseUrl
         if (book.tocUrl == baseUrl) {
-            book.tocHtml = analyzeRule.content.toString()
+            book.tocHtml = body
         }
         Debug.log(bookSource.bookSourceUrl, "└${book.tocUrl}")
     }
diff --git a/app/src/main/java/io/legado/app/model/webBook/BookList.kt b/app/src/main/java/io/legado/app/model/webBook/BookList.kt
index 3ffe8324a..c550f25ea 100644
--- a/app/src/main/java/io/legado/app/model/webBook/BookList.kt
+++ b/app/src/main/java/io/legado/app/model/webBook/BookList.kt
@@ -43,7 +43,7 @@ object BookList {
             scope.ensureActive()
             if (baseUrl.matches(it.toRegex())) {
                 Debug.log(bookSource.bookSourceUrl, "≡链接为详情页")
-                getInfoItem(scope, analyzeRule, bookSource, baseUrl, variableBook.variable)
+                getInfoItem(scope, body, analyzeRule, bookSource, baseUrl, variableBook.variable)
                     ?.let { searchBook ->
                         searchBook.infoHtml = body
                         bookList.add(searchBook)
@@ -71,7 +71,7 @@ object BookList {
         scope.ensureActive()
         if (collections.isEmpty() && bookSource.bookUrlPattern.isNullOrEmpty()) {
             Debug.log(bookSource.bookSourceUrl, "└列表为空,按详情页解析")
-            getInfoItem(scope, analyzeRule, bookSource, baseUrl, variableBook.variable)
+            getInfoItem(scope, body, analyzeRule, bookSource, baseUrl, variableBook.variable)
                 ?.let { searchBook ->
                     searchBook.infoHtml = body
                     bookList.add(searchBook)
@@ -120,6 +120,7 @@ object BookList {
     @Throws(Exception::class)
     private fun getInfoItem(
         scope: CoroutineScope,
+        body: String,
         analyzeRule: AnalyzeRule,
         bookSource: BookSource,
         baseUrl: String,
@@ -132,7 +133,16 @@ object BookList {
         book.originOrder = bookSource.customOrder
         book.type = bookSource.bookSourceType
         analyzeRule.book = book
-        BookInfo.analyzeBookInfo(scope, book, analyzeRule, bookSource, baseUrl, baseUrl, false)
+        BookInfo.analyzeBookInfo(
+            scope,
+            book,
+            body,
+            analyzeRule,
+            bookSource,
+            baseUrl,
+            baseUrl,
+            false
+        )
         if (book.name.isNotBlank()) {
             return book.toSearchBook()
         }