优化
This commit is contained in:
@@ -145,7 +145,7 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
|
|||||||
val task = WebBook
|
val task = WebBook
|
||||||
.searchBook(viewModelScope, source, name, context = searchPool!!)
|
.searchBook(viewModelScope, source, name, context = searchPool!!)
|
||||||
.timeout(60000L)
|
.timeout(60000L)
|
||||||
.onSuccess(searchPool) {
|
.onSuccess(IO) {
|
||||||
it.forEach { searchBook ->
|
it.forEach { searchBook ->
|
||||||
if (searchBook.name == name) {
|
if (searchBook.name == name) {
|
||||||
if ((AppConfig.changeSourceCheckAuthor && searchBook.author.contains(author))
|
if ((AppConfig.changeSourceCheckAuthor && searchBook.author.contains(author))
|
||||||
@@ -185,8 +185,8 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun loadBookInfo(source: BookSource, book: Book) {
|
private fun loadBookInfo(source: BookSource, book: Book) {
|
||||||
WebBook.getBookInfo(viewModelScope, source, book)
|
WebBook.getBookInfo(viewModelScope, source, book, context = searchPool!!)
|
||||||
.onSuccess {
|
.onSuccess(IO) {
|
||||||
if (context.getPrefBoolean(PreferKey.changeSourceLoadToc)) {
|
if (context.getPrefBoolean(PreferKey.changeSourceLoadToc)) {
|
||||||
loadBookToc(source, book)
|
loadBookToc(source, book)
|
||||||
} else {
|
} else {
|
||||||
@@ -195,18 +195,18 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
|
|||||||
val searchBook = book.toSearchBook()
|
val searchBook = book.toSearchBook()
|
||||||
searchCallback?.searchSuccess(searchBook)
|
searchCallback?.searchSuccess(searchBook)
|
||||||
}
|
}
|
||||||
}.onError {
|
}.onError(IO) {
|
||||||
Timber.e(it)
|
Timber.e(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun loadBookToc(source: BookSource, book: Book) {
|
private fun loadBookToc(source: BookSource, book: Book) {
|
||||||
WebBook.getChapterList(viewModelScope, source, book)
|
WebBook.getChapterList(viewModelScope, source, book, context = searchPool!!)
|
||||||
.onSuccess(IO) { chapters ->
|
.onSuccess(IO) { chapters ->
|
||||||
book.latestChapterTitle = chapters.last().title
|
book.latestChapterTitle = chapters.last().title
|
||||||
val searchBook: SearchBook = book.toSearchBook()
|
val searchBook: SearchBook = book.toSearchBook()
|
||||||
searchCallback?.searchSuccess(searchBook)
|
searchCallback?.searchSuccess(searchBook)
|
||||||
}.onError {
|
}.onError(IO) {
|
||||||
Timber.e(it)
|
Timber.e(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user