Merge remote-tracking branch 'origin/master'

app/src/main/java/io/legado/app/App.kt

@@ -29,6 +29,7 @@ import io.legado.app.help.http.Cronet
 import io.legado.app.help.http.ObsoleteUrlFactory
 import io.legado.app.help.http.okHttpClient
 import io.legado.app.help.source.SourceHelp
+import io.legado.app.help.storage.Backup
 import io.legado.app.model.BookCover
 import io.legado.app.utils.defaultSharedPreferences
 import io.legado.app.utils.getPrefBoolean
@@ -69,6 +70,7 @@ class App : Application() {
             }
             RuleBigDataHelp.clearInvalid()
             BookHelp.clearInvalidCache()
+            Backup.clearCache()
             //初始化简繁转换引擎
             when (AppConfig.chineseConverterType) {
                 1 -> ChineseUtils.preLoad(true, TransType.TRADITIONAL_TO_SIMPLE)

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>
 

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")
         }
     }
 

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 ->
+            val sources = appDb.bookSourceDao.allPart
-                appDb.bookSourceDao.upOrder(bookSource.bookSourceUrl, index)
+            sources.forEachIndexed { index, bookSource ->
+                bookSource.customOrder = index
             }
+            appDb.bookSourceDao.upOrder(sources)
         }
     }
 

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)
         }
     }
 
@@ -228,4 +230,9 @@ object Backup {
             }
         }
     }
+
+    fun clearCache() {
+        FileUtils.delete(backupPath)
+        FileUtils.delete(zipFilePath)
+    }
 }