This commit is contained in:
Horis 2023-06-24 21:18:24 +08:00
parent a23f8eddcd
commit c302be370f
2 changed files with 8 additions and 10 deletions

View File

@ -166,7 +166,12 @@ class ExploreShowActivity : VMBaseActivity<ActivityExploreShowBinding, ExploreSh
waitDialog.setText("添加书架中...") waitDialog.setText("添加书架中...")
} }
books.forEach { books.forEach {
if (isInBookshelf(it.name, it.author)) return@forEach appDb.bookDao.getBook(it.bookUrl)?.let { book ->
book.group = book.group or groupId
it.order = appDb.bookDao.minOrder - 1
book.save()
return@forEach
}
if (it.tocUrl.isEmpty()) { if (it.tocUrl.isEmpty()) {
val source = appDb.bookSourceDao.getBookSource(it.origin)!! val source = appDb.bookSourceDao.getBookSource(it.origin)!!
WebBook.getBookInfoAwait(source, it) WebBook.getBookInfoAwait(source, it)

View File

@ -74,19 +74,12 @@ class ExploreShowViewModel(application: Application) : BaseViewModel(application
val url = exploreUrl val url = exploreUrl
if (source == null || url == null) return emptyList() if (source == null || url == null) return emptyList()
val searchBooks = arrayListOf<SearchBook>() val searchBooks = arrayListOf<SearchBook>()
var reverse = false for (page in start .. end) {
val range = if (start <= end) {
start .. end
} else {
reverse = true
start downTo end
}
for (page in range) {
val books = WebBook.exploreBookAwait(source, url, page) val books = WebBook.exploreBookAwait(source, url, page)
if (books.isEmpty()) break if (books.isEmpty()) break
if (reverse) books.reverse()
searchBooks.addAll(books) searchBooks.addAll(books)
} }
searchBooks.reverse()
return searchBooks return searchBooks
} }