From c302be370fc3e94899a08668b82fc7ac7e4b8089 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Sat, 24 Jun 2023 21:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/ui/book/explore/ExploreShowActivity.kt |  7 ++++++-
 .../app/ui/book/explore/ExploreShowViewModel.kt       | 11 ++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt
index 37ea0fb87..47c67aa1d 100644
--- a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt
@@ -166,7 +166,12 @@ class ExploreShowActivity : VMBaseActivity<ActivityExploreShowBinding, ExploreSh
                 waitDialog.setText("添加书架中...")
             }
             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()) {
                     val source = appDb.bookSourceDao.getBookSource(it.origin)!!
                     WebBook.getBookInfoAwait(source, it)
diff --git a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
index 91dc71d52..cdaa0165e 100644
--- a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
@@ -74,19 +74,12 @@ class ExploreShowViewModel(application: Application) : BaseViewModel(application
         val url = exploreUrl
         if (source == null || url == null) return emptyList()
         val searchBooks = arrayListOf<SearchBook>()
-        var reverse = false
-        val range = if (start <= end) {
-            start .. end
-        } else {
-            reverse = true
-            start downTo end
-        }
-        for (page in range) {
+        for (page in start .. end) {
             val books = WebBook.exploreBookAwait(source, url, page)
             if (books.isEmpty()) break
-            if (reverse) books.reverse()
             searchBooks.addAll(books)
         }
+        searchBooks.reverse()
         return searchBooks
     }