优化

gedoor · Feb 4, 2024 · f091607 · f091607
1 parent 787263c
commit f091607
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/app/src/main/java/io/legado/app/service/CacheBookService.kt b/app/src/main/java/io/legado/app/service/CacheBookService.kt
@@ -23,6 +23,8 @@ import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import splitties.init.appCtx
 import splitties.systemservices.notificationManager
 import java.util.concurrent.Executors
@@ -43,6 +45,7 @@ class CacheBookService : BaseService() {
         Executors.newFixedThreadPool(min(threadCount, AppConst.MAX_THREAD)).asCoroutineDispatcher()
     private var downloadJob: Job? = null
     private var notificationContent = appCtx.getString(R.string.service_starting)
+    private var mutex = Mutex()
     private val notificationBuilder by lazy {
         val builder = NotificationCompat.Builder(this, AppConst.channelIdDownload)
             .setSmallIcon(R.drawable.ic_download)
@@ -102,27 +105,29 @@ class CacheBookService : BaseService() {
             val chapterCount = appDb.bookChapterDao.getChapterCount(bookUrl)
             val book = cacheBook.book
             if (chapterCount == 0) {
-                val name = book.name
-                if (book.tocUrl.isEmpty()) {
-                    kotlin.runCatching {
-                        WebBook.getBookInfoAwait(cacheBook.bookSource, book)
-                    }.onFailure {
-                        val msg = "《$name》目录为空且加载详情页失败\n${it.localizedMessage}"
-                        AppLog.put(msg, it, true)
-                        return@execute
+                mutex.withLock {
+                    val name = book.name
+                    if (book.tocUrl.isEmpty()) {
+                        kotlin.runCatching {
+                            WebBook.getBookInfoAwait(cacheBook.bookSource, book)
+                        }.onFailure {
+                            val msg = "《$name》目录为空且加载详情页失败\n${it.localizedMessage}"
+                            AppLog.put(msg, it, true)
+                            return@execute
+                        }
                     }
-                }
-                WebBook.getChapterListAwait(cacheBook.bookSource, book).onFailure {
-                    if (book.totalChapterNum > 0) {
-                        book.totalChapterNum = 0
-                        book.save()
+                    WebBook.getChapterListAwait(cacheBook.bookSource, book).onFailure {
+                        if (book.totalChapterNum > 0) {
+                            book.totalChapterNum = 0
+                            book.save()
+                        }
+                        AppLog.put("《$name》目录为空且加载目录失败\n${it.localizedMessage}", it, true)
+                        return@execute
+                    }.getOrNull()?.let { toc ->
+                        appDb.bookChapterDao.insert(*toc.toTypedArray())
                     }
-                    AppLog.put("《$name》目录为空且加载目录失败\n${it.localizedMessage}", it, true)
-                    return@execute
-                }.getOrNull()?.let { toc ->
-                    appDb.bookChapterDao.insert(*toc.toTypedArray())
+                    book.save()
                 }
-                book.save()
             }
             val end2 = if (end < 0) {
                 book.lastChapterIndex

diff --git a/app/src/main/java/io/legado/app/web/HttpServer.kt b/app/src/main/java/io/legado/app/web/HttpServer.kt
@@ -14,12 +14,8 @@ import io.legado.app.web.utils.AssetsWeb
 import kotlinx.coroutines.runBlocking
 import okio.Pipe
 import okio.buffer
-import java.io.BufferedWriter
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
-import java.io.OutputStreamWriter
-import kotlin.collections.HashMap
-import kotlin.collections.List
 import kotlin.collections.set
 
 class HttpServer(port: Int) : NanoHTTPD(port) {
@@ -115,10 +111,8 @@ class HttpServer(port: Int) : NanoHTTPD(port) {
                 if (data is List<*> && data.size > 3000) {
                     val pipe = Pipe(16 * 1024)
                     Coroutine.async {
-                        pipe.sink.buffer().outputStream().use { out ->
-                            BufferedWriter(OutputStreamWriter(out, "UTF-8")).use {
-                                GSON.toJson(returnData, it)
-                            }
+                        pipe.sink.buffer().outputStream().bufferedWriter(Charsets.UTF_8).use {
+                            GSON.toJson(returnData, it)
                         }
                     }
                     newChunkedResponse(