From 2ad300c5cfe49e487353d0f25f15649acc63c28e Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Wed, 5 Jan 2022 10:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=92=8C=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E4=BF=9D=E5=AD=98=E6=AD=A3=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/io/legado/app/model/Debug.kt                | 4 ++--
 app/src/main/java/io/legado/app/model/webBook/BookContent.kt  | 3 ++-
 app/src/main/java/io/legado/app/service/CheckSourceService.kt | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/Debug.kt b/app/src/main/java/io/legado/app/model/Debug.kt
index e5225fc99..31bef2c81 100644
--- a/app/src/main/java/io/legado/app/model/Debug.kt
+++ b/app/src/main/java/io/legado/app/model/Debug.kt
@@ -253,8 +253,8 @@ object Debug {
             .onSuccess {
                 log(debugSource, "︽目录页解析完成")
                 log(debugSource, showTime = false)
-                val nextChapterUrl = it.getOrNull(1)?.url
-                contentDebug(scope, bookSource, book, it[0], nextChapterUrl)
+                val nextChapterUrl = it.getOrNull(1)?.url ?: it.first().url
+                contentDebug(scope, bookSource, book, it.first(), nextChapterUrl)
             }
             .onError {
                 log(debugSource, it.msg, state = -1)
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 754cbc133..d3f0e004b 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
@@ -35,7 +35,7 @@ object BookContent {
         redirectUrl: String,
         baseUrl: String,
         body: String?,
-        nextChapterUrl: String? = null,
+        nextChapterUrl: String?,
         needSave: Boolean = true
     ): String {
         body ?: throw NoStackTraceException(
@@ -47,6 +47,7 @@ object BookContent {
             nextChapterUrl
         } else {
             appDb.bookChapterDao.getChapter(book.bookUrl, bookChapter.index + 1)?.url
+                ?: appDb.bookChapterDao.getChapter(book.bookUrl, 0)?.url
         }
         val content = StringBuilder()
         val nextUrlList = arrayListOf(baseUrl)
diff --git a/app/src/main/java/io/legado/app/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
index d1aa3da97..6887de070 100644
--- a/app/src/main/java/io/legado/app/service/CheckSourceService.kt
+++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
@@ -135,12 +135,13 @@ class CheckSourceService : BaseService() {
             }
             val book = WebBook.getBookInfoAwait(this, source, books.first().toBook())
             val toc = WebBook.getChapterListAwait(this, source, book)
+            val nextChapterUrl = toc.getOrNull(1)?.url ?: toc.first().url
             val content = WebBook.getContentAwait(
                 this,
                 bookSource = source,
                 book = book,
                 bookChapter = toc.first(),
-                nextChapterUrl = toc.getOrNull(1)?.url,
+                nextChapterUrl = nextChapterUrl,
                 needSave = false
             )
             if (content.isBlank()) {