From cc41f5130e47ce12436a2b0220928ea655fc2e73 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 19 Mar 2020 14:08:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/help/storage/Backup.kt | 57 ++++++++++---------
 .../io/legado/app/help/storage/OldBook.kt     |  1 -
 2 files changed, 30 insertions(+), 28 deletions(-)

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 8c4fa8fc2..32bc2b765 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
@@ -54,35 +54,37 @@ object Backup {
     suspend fun backup(context: Context, path: String = legadoPath) {
         context.putPrefLong(PreferKey.lastBackup, System.currentTimeMillis())
         withContext(IO) {
-            writeListToJson(App.db.bookDao().all, "bookshelf.json", backupPath)
-            writeListToJson(App.db.bookGroupDao().all, "bookGroup.json", backupPath)
-            writeListToJson(App.db.bookSourceDao().all, "bookSource.json", backupPath)
-            writeListToJson(App.db.rssSourceDao().all, "rssSource.json", backupPath)
-            writeListToJson(App.db.rssStarDao().all, "rssStar.json", backupPath)
-            writeListToJson(App.db.replaceRuleDao().all, "replaceRule.json", backupPath)
-            GSON.toJson(ReadBookConfig.configList)?.let {
-                FileUtils.createFileIfNotExist(backupPath + File.separator + ReadBookConfig.readConfigFileName)
-                    .writeText(it)
-            }
-            Preferences.getSharedPreferences(App.INSTANCE, backupPath, "config")?.let { sp ->
-                val edit = sp.edit()
-                App.INSTANCE.defaultSharedPreferences.all.map {
-                    when (val value = it.value) {
-                        is Int -> edit.putInt(it.key, value)
-                        is Boolean -> edit.putBoolean(it.key, value)
-                        is Long -> edit.putLong(it.key, value)
-                        is Float -> edit.putFloat(it.key, value)
-                        is String -> edit.putString(it.key, value)
-                        else -> Unit
+            synchronized(this@Backup) {
+                writeListToJson(App.db.bookDao().all, "bookshelf.json", backupPath)
+                writeListToJson(App.db.bookGroupDao().all, "bookGroup.json", backupPath)
+                writeListToJson(App.db.bookSourceDao().all, "bookSource.json", backupPath)
+                writeListToJson(App.db.rssSourceDao().all, "rssSource.json", backupPath)
+                writeListToJson(App.db.rssStarDao().all, "rssStar.json", backupPath)
+                writeListToJson(App.db.replaceRuleDao().all, "replaceRule.json", backupPath)
+                GSON.toJson(ReadBookConfig.configList)?.let {
+                    FileUtils.createFileIfNotExist(backupPath + File.separator + ReadBookConfig.readConfigFileName)
+                        .writeText(it)
+                }
+                Preferences.getSharedPreferences(App.INSTANCE, backupPath, "config")?.let { sp ->
+                    val edit = sp.edit()
+                    App.INSTANCE.defaultSharedPreferences.all.map {
+                        when (val value = it.value) {
+                            is Int -> edit.putInt(it.key, value)
+                            is Boolean -> edit.putBoolean(it.key, value)
+                            is Long -> edit.putLong(it.key, value)
+                            is Float -> edit.putFloat(it.key, value)
+                            is String -> edit.putString(it.key, value)
+                            else -> Unit
+                        }
                     }
+                    edit.commit()
+                }
+                WebDavHelp.backUpWebDav(backupPath)
+                if (path.isContentPath()) {
+                    copyBackup(context, Uri.parse(path))
+                } else {
+                    copyBackup(File(path))
                 }
-                edit.commit()
-            }
-            WebDavHelp.backUpWebDav(backupPath)
-            if (path.isContentPath()) {
-                copyBackup(context, Uri.parse(path))
-            } else {
-                copyBackup(File(path))
             }
         }
     }
@@ -96,6 +98,7 @@ object Backup {
 
     @Throws(java.lang.Exception::class)
     private fun copyBackup(context: Context, uri: Uri) {
+
         DocumentFile.fromTreeUri(context, uri)?.let { treeDoc ->
             for (fileName in backupFileNames) {
                 val file = File(backupPath + File.separator + fileName)
diff --git a/app/src/main/java/io/legado/app/help/storage/OldBook.kt b/app/src/main/java/io/legado/app/help/storage/OldBook.kt
index f8321973c..a782cf5f5 100644
--- a/app/src/main/java/io/legado/app/help/storage/OldBook.kt
+++ b/app/src/main/java/io/legado/app/help/storage/OldBook.kt
@@ -40,7 +40,6 @@ object OldBook {
             book.durChapterTitle = jsonItem.readString("$.durChapterName")
             book.durChapterPos = jsonItem.readInt("$.durChapterPage") ?: 0
             book.durChapterTime = jsonItem.readLong("$.finalDate") ?: 0
-            book.group = jsonItem.readInt("$.group") ?: 0
             book.intro = jsonItem.readString("$.bookInfoBean.introduce")
             book.latestChapterTitle = jsonItem.readString("$.lastChapterName")
             book.lastCheckCount = jsonItem.readInt("$.newChapters") ?: 0