renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-08-01 22:51:01 +08:00
parent 8779e86f9e
commit 657b8dd5b4
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
View File

@@ -115,7 +115,9 @@ class Coroutine<T>(
//取消当前任务
fun cancel(cause: ActivelyCancelException = ActivelyCancelException()) {
job.cancel(cause)
if (!job.isCancelled) {
job.cancel(cause)
}
cancel?.let {
MainScope().launch {
if (null == it.context) {
@@ -146,7 +148,7 @@ class Coroutine<T>(
success?.let { dispatchCallback(this, value, it) }
} catch (e: Throwable) {
e.printOnDebug()
if (e is CancellationException && isActive) {
if (e is CancellationException && !isActive && e !is ActivelyCancelException) {
this@Coroutine.cancel()
}
if (e is CancellationException && e !is TimeoutCancellationException) {

9
app/src/main/java/io/legado/app/service/CheckSourceService.kt
View File

@@ -190,15 +190,6 @@ class CheckSourceService : BaseService() {
}.onSuccess(searchCoroutine) {
source.removeGroup("校验超时")
Debug.updateFinalMessage(source.bookSourceUrl, "校验成功")
}.onCancel(IO) {
source.addGroup("校验超时")
source.bookSourceComment =
"Error: 校验超时" + if (source.bookSourceComment.isNullOrBlank())
"" else "\n\n${source.bookSourceComment}"
Debug.updateFinalMessage(source.bookSourceUrl, "校验失败: 校验超时")
source.respondTime = Debug.getRespondTime(source.bookSourceUrl)
appDb.bookSourceDao.update(source)
onNext(source.bookSourceUrl, source.bookSourceName)
}.onFinally(IO) {
source.respondTime = Debug.getRespondTime(source.bookSourceUrl)
appDb.bookSourceDao.update(source)