From f8c33b207af81c0f3c427d0fe32cf0be4d8b5529 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Fri, 23 Jun 2023 14:37:43 +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

---
 app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt | 7 +++++++
 app/src/main/java/io/legado/app/help/book/BookHelp.kt     | 4 ++++
 app/src/main/java/io/legado/app/help/source/SourceHelp.kt | 6 ++++--
 app/src/main/java/io/legado/app/help/storage/Backup.kt    | 4 +++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
index bb88566c7..573877db3 100644
--- a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
+++ b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
@@ -175,6 +175,13 @@ interface BookSourceDao {
     @get:Query("select * from book_sources order by customOrder asc")
     val all: List<BookSource>
 
+    @get:Query(
+        """select bookSourceUrl, bookSourceName, bookSourceGroup, customOrder, enabled, enabledExplore,
+        trim(loginUrl) <> '' hasLoginUrl, lastUpdateTime, respondTime, weight, trim(exploreUrl) <> '' hasExploreUrl
+        from book_sources order by customOrder asc"""
+    )
+    val allPart: List<BookSourcePart>
+
     @get:Query("select * from book_sources where enabled = 1 order by customOrder")
     val allEnabled: List<BookSource>
 
diff --git a/app/src/main/java/io/legado/app/help/book/BookHelp.kt b/app/src/main/java/io/legado/app/help/book/BookHelp.kt
index 568c69b61..0ef692863 100644
--- a/app/src/main/java/io/legado/app/help/book/BookHelp.kt
+++ b/app/src/main/java/io/legado/app/help/book/BookHelp.kt
@@ -92,6 +92,10 @@ object BookHelp {
                     }
                 }
             FileUtils.delete(ArchiveUtils.TEMP_PATH)
+            val filesDir = appCtx.filesDir
+            FileUtils.delete("$filesDir/shareBookSource.json")
+            FileUtils.delete("$filesDir/shareRssSource.json")
+            FileUtils.delete("$filesDir/books.json")
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/help/source/SourceHelp.kt b/app/src/main/java/io/legado/app/help/source/SourceHelp.kt
index 7ed386ab1..c5965bd50 100644
--- a/app/src/main/java/io/legado/app/help/source/SourceHelp.kt
+++ b/app/src/main/java/io/legado/app/help/source/SourceHelp.kt
@@ -82,9 +82,11 @@ object SourceHelp {
             appDb.bookSourceDao.maxOrder > 99999
             || appDb.bookSourceDao.minOrder < -99999
         ) {
-            appDb.bookSourceDao.all.forEachIndexed { index, bookSource ->
-                appDb.bookSourceDao.upOrder(bookSource.bookSourceUrl, index)
+            val sources = appDb.bookSourceDao.allPart
+            sources.forEachIndexed { index, bookSource ->
+                bookSource.customOrder = index
             }
+            appDb.bookSourceDao.upOrder(sources)
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/help/storage/Backup.kt b/app/src/main/java/io/legado/app/help/storage/Backup.kt
index 4403d4f2f..79a9e27b3 100644
--- a/app/src/main/java/io/legado/app/help/storage/Backup.kt
+++ b/app/src/main/java/io/legado/app/help/storage/Backup.kt
@@ -36,7 +36,7 @@ object Backup {
     val backupPath: String by lazy {
         appCtx.filesDir.getFile("backup").createFolderIfNotExist().absolutePath
     }
-    val zipFilePath = "${appCtx.externalFiles.absolutePath}${File.separator}backup.zip"
+    val zipFilePath = "${appCtx.externalFiles.absolutePath}${File.separator}tmp_backup.zip"
 
     private val backupFileNames by lazy {
         arrayOf(
@@ -166,6 +166,7 @@ object Backup {
                 paths[i] = backupPath + File.separator + paths[i]
             }
             FileUtils.delete(zipFilePath)
+            FileUtils.delete(zipFilePath.replace("tmp_", ""))
             val backupFileName = if (AppConfig.onlyLatestBackup) {
                 "backup.zip"
             } else {
@@ -188,6 +189,7 @@ object Backup {
                 AppWebDav.backUpWebDav(zipFileName)
             }
             FileUtils.delete(backupPath)
+            FileUtils.delete(zipFilePath)
         }
     }