优化

app/src/main/java/io/legado/app/model/CacheBook.kt

@@ -98,7 +98,7 @@ class CacheBook(var bookSource: BookSource, var book: Book) {
             get() {
                 var count = 0
                 cacheBookMap.forEach {
-                    count += it.value.waitDownloadSet.size
+                    count += it.value.waitCount
                 }
                 return count
             }
@@ -107,7 +107,7 @@ class CacheBook(var bookSource: BookSource, var book: Book) {
             get() {
                 var count = 0
                 cacheBookMap.forEach {
-                    count += it.value.successDownloadSet.size
+                    count += it.value.successCount
                 }
                 return count
             }
@@ -116,59 +116,83 @@ class CacheBook(var bookSource: BookSource, var book: Book) {
             get() {
                 var count = 0
                 cacheBookMap.forEach {
-                    count += it.value.onDownloadSet.size
+                    count += it.value.onDownloadCount
                 }
                 return count
             }
 
+        val errorCount: Int
+            get() {
+                var count = 0
+                cacheBookMap.forEach {
+                    count += it.value.errorCount
+                }
+                return count
             }
+    }
+
+    private val waitDownloadSet = hashSetOf<Int>()
+    private val onDownloadSet = hashSetOf<Int>()
+    private val successDownloadSet = hashSetOf<Int>()
+    private val errorDownloadMap = hashMapOf<Int, Int>()
+
+    val waitCount get() = waitDownloadSet.size
+    val onDownloadCount get() = onDownloadSet.size
+    val successCount get() = successDownloadSet.size
+    val errorCount get() = errorDownloadMap.size
 
-    val waitDownloadSet = hashSetOf<Int>()
-    val onDownloadSet = hashSetOf<Int>()
-    val successDownloadSet = hashSetOf<Int>()
+    @Synchronized
+    fun isRun(): Boolean {
+        return waitDownloadSet.size > 0 || onDownloadSet.size > 0
+    }
 
+    @Synchronized
     fun addDownload(start: Int, end: Int) {
-        synchronized(this) {
         for (i in start..end) {
             waitDownloadSet.add(i)
         }
     }
-    }
-
-    fun isRun(): Boolean {
-        return synchronized(this) {
-            waitDownloadSet.size > 0 || onDownloadSet.size > 0
-        }
-    }
 
+    @Synchronized
     private fun onSuccess(index: Int) {
-        synchronized(this) {
         onDownloadSet.remove(index)
         successDownloadSet.add(index)
-        }
+        errorDownloadMap.remove(index)
     }
 
-    private fun onErrorOrCancel(index: Int) {
-        synchronized(this) {
+    @Synchronized
+    private fun onError(index: Int, error: Throwable, chapterTitle: String) {
+        if (error !is ConcurrentException) {
+            errorDownloadMap[index] = (errorDownloadMap[index] ?: 0) + 1
+        }
         onDownloadSet.remove(index)
+        //重试3次
+        if (errorDownloadMap[index] ?: 0 < 3) {
             waitDownloadSet.add(index)
+        } else {
+            addLog("${book.name}-${chapterTitle} ${error.localizedMessage}")
+        }
     }
+
+    @Synchronized
+    private fun onCancel(index: Int) {
+        onDownloadSet.remove(index)
+        waitDownloadSet.add(index)
     }
 
+    @Synchronized
     private fun onFinally() {
-        synchronized(this) {
         if (waitDownloadSet.isEmpty() && onDownloadSet.isEmpty()) {
             postEvent(EventBus.UP_DOWNLOAD, "")
             cacheBookMap.remove(book.bookUrl)
         }
     }
-    }
 
     /**
      * 从待下载列表内取第一条下载
      */
+    @Synchronized
     fun download(scope: CoroutineScope, context: CoroutineContext): Boolean {
-        synchronized(this) {
         val chapterIndex = waitDownloadSet.firstOrNull()
         if (chapterIndex == null) {
             if (onDownloadSet.isEmpty()) {
@@ -198,7 +222,6 @@ class CacheBook(var bookSource: BookSource, var book: Book) {
             context = context
         ).onSuccess { content ->
             onSuccess(chapterIndex)
-                addLog("${book.name}-${chapter.title} getContentSuccess")
             downloadFinish(chapter, content)
         }.onError {
             //出现错误等待后重新加入待下载列表
@@ -206,18 +229,15 @@ class CacheBook(var bookSource: BookSource, var book: Book) {
                 is ConcurrentException -> delay(it.waitTime)
                 else -> delay(1000)
             }
-                onErrorOrCancel(chapterIndex)
-                print(it.localizedMessage)
-                addLog("${book.name}-${chapter.title} getContentError${it.localizedMessage}")
-                downloadFinish(chapter, it.localizedMessage ?: "download error")
+            onError(chapterIndex, it, chapter.title)
+            downloadFinish(chapter, "error:${it.localizedMessage}")
         }.onCancel {
-                onErrorOrCancel(chapterIndex)
+            onCancel(chapterIndex)
         }.onFinally {
             onFinally()
         }
         return true
     }
-    }
 
     @Synchronized
     fun download(
@@ -225,7 +245,6 @@ class CacheBook(var bookSource: BookSource, var book: Book) {
         chapter: BookChapter,
         resetPageOffset: Boolean = false
     ) {
-        synchronized(this) {
         if (onDownloadSet.contains(chapter.index)) {
             return
         }
@@ -235,21 +254,16 @@ class CacheBook(var bookSource: BookSource, var book: Book) {
                 onSuccess(chapter.index)
                 downloadFinish(chapter, content, resetPageOffset)
             }.onError {
-                    onErrorOrCancel(chapter.index)
-                    downloadFinish(
-                        chapter,
-                        it.localizedMessage ?: "download error",
-                        resetPageOffset
-                    )
+                onError(chapter.index, it, chapter.title)
+                downloadFinish(chapter, "error:${it.localizedMessage}", resetPageOffset)
             }.onCancel {
-                    onErrorOrCancel(chapter.index)
+                onCancel(chapter.index)
             }.onFinally {
                 if (waitDownloadSet.isEmpty() && onDownloadSet.isEmpty()) {
                     postEvent(EventBus.UP_DOWNLOAD, "")
                 }
             }
     }
-    }
 
     private fun downloadFinish(
         chapter: BookChapter,

app/src/main/java/io/legado/app/model/Exceptions.kt

@@ -1,5 +1,11 @@
 package io.legado.app.model
 
+/**
+ * 内容为空
+ */
 class ContentEmptyException(msg: String) : Exception(msg)
 
+/**
+ * 并发限制
+ */
 class ConcurrentException(msg: String, val waitTime: Long) : Exception(msg)

app/src/main/java/io/legado/app/service/CacheBookService.kt

@@ -108,7 +108,7 @@ class CacheBookService : BaseService() {
 
     private fun upNotificationContent() {
         notificationContent =
-            "正在下载:${CacheBook.onDownloadCount}/等待中:${CacheBook.waitDownloadCount}/成功:${CacheBook.successDownloadCount}"
+            "正在下载:${CacheBook.onDownloadCount}|等待中:${CacheBook.waitDownloadCount}|失败:${CacheBook.errorCount}|成功:${CacheBook.successDownloadCount}"
         upNotification()
     }