优化代码

app/src/main/java/io/legado/app/api/controller/BookshelfController.kt

@@ -66,7 +66,7 @@ object BookshelfController {
             } else {
                 App.db.bookSourceDao.getBookSource(book.origin)?.let { source ->
                     runBlocking {
-                        WebBook(source).getContentSuspend(book, chapter)
+                        WebBook(source).getContentAwait(book, chapter)
                     }.let {
                         saveBookReadIndex(book, index)
                         returnData.setData(it)

app/src/main/java/io/legado/app/model/webBook/BookInfo.kt

@@ -10,11 +10,13 @@ import io.legado.app.model.analyzeRule.AnalyzeRule
 import io.legado.app.utils.NetworkUtils
 import io.legado.app.utils.StringUtils.wordCountFormat
 import io.legado.app.utils.htmlFormat
+import kotlinx.coroutines.CoroutineScope
 
 object BookInfo {
 
     @Throws(Exception::class)
     fun analyzeBookInfo(
+        scope: CoroutineScope,
         book: Book,
         body: String?,
         bookSource: BookSource,

app/src/main/java/io/legado/app/model/webBook/WebBook.kt

@@ -11,6 +11,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
 
+@Suppress("MemberVisibilityCanBePrivate")
 class WebBook(val bookSource: BookSource) {
 
     val sourceUrl: String
@@ -26,11 +27,11 @@ class WebBook(val bookSource: BookSource) {
         context: CoroutineContext = Dispatchers.IO,
     ): Coroutine<ArrayList<SearchBook>> {
         return Coroutine.async(scope, context) {
-            searchBookSuspend(scope, key, page)
+            searchBookAwait(scope, key, page)
         }
     }
 
-    suspend fun searchBookSuspend(
+    suspend fun searchBookAwait(
         scope: CoroutineScope,
         key: String,
         page: Int? = 1,
@@ -68,28 +69,36 @@ class WebBook(val bookSource: BookSource) {
         scope: CoroutineScope = Coroutine.DEFAULT,
         context: CoroutineContext = Dispatchers.IO,
     ): Coroutine<List<SearchBook>> {
-        val variableBook = SearchBook()
         return Coroutine.async(scope, context) {
-            val analyzeUrl = AnalyzeUrl(
+            exploreBookAwait(url, page, scope)
-                ruleUrl = url,
-                page = page,
-                baseUrl = sourceUrl,
-                book = variableBook,
-                headerMapF = bookSource.getHeaderMap()
-            )
-            val res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)
-            BookList.analyzeBookList(
-                scope,
-                res.body,
-                bookSource,
-                analyzeUrl,
-                res.url,
-                variableBook,
-                false
-            )
         }
     }
 
+    suspend fun exploreBookAwait(
+        url: String,
+        page: Int? = 1,
+        scope: CoroutineScope = Coroutine.DEFAULT
+    ): ArrayList<SearchBook> {
+        val variableBook = SearchBook()
+        val analyzeUrl = AnalyzeUrl(
+            ruleUrl = url,
+            page = page,
+            baseUrl = sourceUrl,
+            book = variableBook,
+            headerMapF = bookSource.getHeaderMap()
+        )
+        val res = analyzeUrl.getStrResponse(bookSource.bookSourceUrl)
+        return BookList.analyzeBookList(
+            scope,
+            res.body,
+            bookSource,
+            analyzeUrl,
+            res.url,
+            variableBook,
+            false
+        )
+    }
+
     /**
      * 书籍信息
      */
@@ -100,23 +109,38 @@ class WebBook(val bookSource: BookSource) {
         canReName: Boolean = true,
     ): Coroutine<Book> {
         return Coroutine.async(scope, context) {
-            book.type = bookSource.bookSourceType
+            getBookInfoAwait(book, scope, canReName)
-            if (!book.infoHtml.isNullOrEmpty()) {
-                book.infoHtml
-                BookInfo.analyzeBookInfo(book, book.infoHtml, bookSource, book.bookUrl, canReName)
-            } else {
-                val res = AnalyzeUrl(
-                    ruleUrl = book.bookUrl,
-                    baseUrl = sourceUrl,
-                    headerMapF = bookSource.getHeaderMap(),
-                    book = book
-                ).getStrResponse(bookSource.bookSourceUrl)
-                BookInfo.analyzeBookInfo(book, res.body, bookSource, book.bookUrl, canReName)
-            }
-            book
         }
     }
 
+    suspend fun getBookInfoAwait(
+        book: Book,
+        scope: CoroutineScope = Coroutine.DEFAULT,
+        canReName: Boolean = true,
+    ): Book {
+        book.type = bookSource.bookSourceType
+        if (!book.infoHtml.isNullOrEmpty()) {
+            book.infoHtml
+            BookInfo.analyzeBookInfo(
+                scope,
+                book,
+                book.infoHtml,
+                bookSource,
+                book.bookUrl,
+                canReName
+            )
+        } else {
+            val res = AnalyzeUrl(
+                ruleUrl = book.bookUrl,
+                baseUrl = sourceUrl,
+                headerMapF = bookSource.getHeaderMap(),
+                book = book
+            ).getStrResponse(bookSource.bookSourceUrl)
+            BookInfo.analyzeBookInfo(scope, book, res.body, bookSource, book.bookUrl, canReName)
+        }
+        return book
+    }
+
     /**
      * 目录
      */
@@ -126,31 +150,25 @@ class WebBook(val bookSource: BookSource) {
         context: CoroutineContext = Dispatchers.IO
     ): Coroutine<List<BookChapter>> {
         return Coroutine.async(scope, context) {
-            book.type = bookSource.bookSourceType
+            getChapterListAwait(book, scope)
-            if (book.bookUrl == book.tocUrl && !book.tocHtml.isNullOrEmpty()) {
+        }
-                BookChapterList.analyzeChapterList(
+    }
-                    this,
-                    book,
-                    book.tocHtml,
-                    bookSource,
-                    book.tocUrl
-                )
-            } else {
-                val res = AnalyzeUrl(
-                    book = book,
-                    ruleUrl = book.tocUrl,
-                    baseUrl = book.bookUrl,
-                    headerMapF = bookSource.getHeaderMap()
-                ).getStrResponse(bookSource.bookSourceUrl)
-                BookChapterList.analyzeChapterList(
-                    this,
-                    book,
-                    res.body,
-                    bookSource,
-                    book.tocUrl
-                )
-            }
 
+    suspend fun getChapterListAwait(
+        book: Book,
+        scope: CoroutineScope = Coroutine.DEFAULT
+    ): List<BookChapter> {
+        book.type = bookSource.bookSourceType
+        return if (book.bookUrl == book.tocUrl && !book.tocHtml.isNullOrEmpty()) {
+            BookChapterList.analyzeChapterList(scope, book, book.tocHtml, bookSource, book.tocUrl)
+        } else {
+            val res = AnalyzeUrl(
+                book = book,
+                ruleUrl = book.tocUrl,
+                baseUrl = book.bookUrl,
+                headerMapF = bookSource.getHeaderMap()
+            ).getStrResponse(bookSource.bookSourceUrl)
+            BookChapterList.analyzeChapterList(scope, book, res.body, bookSource, book.tocUrl)
         }
     }
 
@@ -165,16 +183,11 @@ class WebBook(val bookSource: BookSource) {
         context: CoroutineContext = Dispatchers.IO
     ): Coroutine<String> {
         return Coroutine.async(scope, context) {
-            getContentSuspend(
+            getContentAwait(book, bookChapter, nextChapterUrl, scope)
-                book, bookChapter, nextChapterUrl, scope
-            )
         }
     }
 
-    /**
+    suspend fun getContentAwait(
-     * 章节内容
-     */
-    suspend fun getContentSuspend(
         book: Book,
         bookChapter: BookChapter,
         nextChapterUrl: String? = null,

app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@@ -216,7 +216,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
             App.db.bookSourceDao.allTextEnabled.forEach { source ->
                 try {
                     WebBook(source)
-                        .searchBookSuspend(this, name)
+                        .searchBookAwait(this, name)
                         .getOrNull(0)?.let {
                             if (it.name == name && (it.author == author || author == "")) {
                                 val book = it.toBook()