优化
This commit is contained in:
@@ -115,28 +115,25 @@ class ReadMangaViewModel(application: Application) : BaseViewModel(application)
|
|||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun loadChapterListAwait(book: Book): Boolean {
|
private suspend fun loadChapterListAwait(book: Book): Boolean {
|
||||||
ReadManga.bookSource?.let {
|
val bookSource = ReadManga.bookSource ?: return true
|
||||||
val oldBook = book.copy()
|
val oldBook = book.copy()
|
||||||
WebBook.getChapterListAwait(it, book, true).onSuccess { cList ->
|
WebBook.getChapterListAwait(bookSource, book, true).onSuccess { cList ->
|
||||||
if (oldBook.bookUrl == book.bookUrl) {
|
if (oldBook.bookUrl == book.bookUrl) {
|
||||||
appDb.bookDao.update(book)
|
appDb.bookDao.update(book)
|
||||||
} else {
|
} else {
|
||||||
appDb.bookDao.replace(oldBook, book)
|
appDb.bookDao.replace(oldBook, book)
|
||||||
BookHelp.updateCacheFolder(oldBook, book)
|
BookHelp.updateCacheFolder(oldBook, book)
|
||||||
}
|
|
||||||
appDb.bookChapterDao.delByBook(oldBook.bookUrl)
|
|
||||||
appDb.bookChapterDao.insert(*cList.toTypedArray())
|
|
||||||
ReadManga.onChapterListUpdated(book)
|
|
||||||
return true
|
|
||||||
}.onFailure {
|
|
||||||
//加载章节出错
|
|
||||||
ReadManga.mCallback?.loadFail(appCtx.getString(R.string.error_load_toc))
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
appDb.bookChapterDao.delByBook(oldBook.bookUrl)
|
||||||
|
appDb.bookChapterDao.insert(*cList.toTypedArray())
|
||||||
|
ReadManga.onChapterListUpdated(book)
|
||||||
|
return true
|
||||||
|
}.onFailure {
|
||||||
|
//加载章节出错
|
||||||
|
ReadManga.mCallback?.loadFail(appCtx.getString(R.string.error_load_toc))
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -252,7 +249,7 @@ class ReadMangaViewModel(application: Application) : BaseViewModel(application)
|
|||||||
try {
|
try {
|
||||||
LocalBook.getBookInputStream(book)
|
LocalBook.getBookInputStream(book)
|
||||||
return true
|
return true
|
||||||
} catch (e: Throwable) {
|
} catch (_: Throwable) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user