k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 修复bug

Browse Source
pull/248/head
gedoor 5 years ago
parent a54062b941
commit 65864b6fd0
2 changed files with 55 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      app/src/main/java/io/legado/app/data/AppDatabase.kt
  2. 143
      app/src/main/java/io/legado/app/help/storage/ImportOldData.kt

1
app/src/main/java/io/legado/app/data/AppDatabase.kt
Unescape View File

@ -37,6 +37,7 @@ abstract class AppDatabase : RoomDatabase() {
GlobalScope.launch { Restore.restoreDatabase(Backup.backupPath) } GlobalScope.launch { Restore.restoreDatabase(Backup.backupPath) }
} }
}) })
.allowMainThreadQueries()
.build() .build()
} }

143
app/src/main/java/io/legado/app/help/storage/ImportOldData.kt
Unescape View File

@ -6,113 +6,78 @@ import androidx.documentfile.provider.DocumentFile
import io.legado.app.App import io.legado.app.App
import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.BookSource
import io.legado.app.data.entities.ReplaceRule import io.legado.app.data.entities.ReplaceRule
import io.legado.app.help.coroutine.Coroutine
import io.legado.app.utils.DocumentUtils import io.legado.app.utils.DocumentUtils
import io.legado.app.utils.FileUtils import io.legado.app.utils.FileUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.anko.toast import org.jetbrains.anko.toast
import java.io.File import java.io.File
object ImportOldData { object ImportOldData {
fun import(context: Context, file: File) { fun import(context: Context, file: File) {
GlobalScope.launch(Dispatchers.IO) { try {// 导入书架
try {// 导入书架 val shelfFile =
val shelfFile = FileUtils.createFileIfNotExist(file, "myBookShelf.json")
FileUtils.createFileIfNotExist(file, "myBookShelf.json") val json = shelfFile.readText()
val json = shelfFile.readText() val importCount = importOldBookshelf(json)
val importCount = importOldBookshelf(json) context.toast("成功导入书籍${importCount}")
withContext(Dispatchers.Main) { } catch (e: Exception) {
context.toast("成功导入书籍${importCount}") context.toast("导入书籍失败\n${e.localizedMessage}")
} }
} catch (e: Exception) {
withContext(Dispatchers.Main) {
context.toast("导入书籍失败\n${e.localizedMessage}")
}
}
try {// Book source try {// Book source
val sourceFile = val sourceFile =
FileUtils.getFile(file, "myBookSource.json") FileUtils.getFile(file, "myBookSource.json")
val json = sourceFile.readText() val json = sourceFile.readText()
val importCount = importOldSource(json) val importCount = importOldSource(json)
withContext(Dispatchers.Main) { context.toast("成功导入书源${importCount}")
context.toast("成功导入书源${importCount}") } catch (e: Exception) {
} context.toast("导入源失败\n${e.localizedMessage}")
} catch (e: Exception) { }
withContext(Dispatchers.Main) {
context.toast("导入源失败\n${e.localizedMessage}")
}
}
try {// Replace rules try {// Replace rules
val ruleFile = FileUtils.getFile(file, "myBookReplaceRule.json") val ruleFile = FileUtils.getFile(file, "myBookReplaceRule.json")
if (ruleFile.exists()) { if (ruleFile.exists()) {
val json = ruleFile.readText() val json = ruleFile.readText()
val importCount = importOldReplaceRule(json) val importCount = importOldReplaceRule(json)
withContext(Dispatchers.Main) { context.toast("成功导入替换规则${importCount}")
context.toast("成功导入替换规则${importCount}") } else {
} context.toast("未找到替换规则")
} else {
withContext(Dispatchers.Main) {
context.toast("未找到替换规则")
}
}
} catch (e: Exception) {
withContext(Dispatchers.Main) {
context.toast("导入替换规则失败\n${e.localizedMessage}")
}
} }
} catch (e: Exception) {
context.toast("导入替换规则失败\n${e.localizedMessage}")
} }
} }
fun importUri(uri: Uri) { fun importUri(uri: Uri) {
Coroutine.async { DocumentFile.fromTreeUri(App.INSTANCE, uri)?.listFiles()?.forEach {
DocumentFile.fromTreeUri(App.INSTANCE, uri)?.listFiles()?.forEach { when (it.name) {
when (it.name) { "myBookShelf.json" ->
"myBookShelf.json" -> try {
try { DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json -> val importCount = importOldBookshelf(json)
val importCount = importOldBookshelf(json) App.INSTANCE.toast("成功导入书籍${importCount}")
withContext(Dispatchers.Main) {
App.INSTANCE.toast("成功导入书籍${importCount}")
}
}
} catch (e: java.lang.Exception) {
withContext(Dispatchers.Main) {
App.INSTANCE.toast("导入书籍失败\n${e.localizedMessage}")
}
} }
"myBookSource.json" -> } catch (e: java.lang.Exception) {
try { App.INSTANCE.toast("导入书籍失败\n${e.localizedMessage}")
DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json -> }
val importCount = importOldSource(json) "myBookSource.json" ->
withContext(Dispatchers.Main) { try {
App.INSTANCE.toast("成功导入书源${importCount}") DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
} val importCount = importOldSource(json)
} App.INSTANCE.toast("成功导入书源${importCount}")
} catch (e: Exception) {
withContext(Dispatchers.Main) {
App.INSTANCE.toast("导入源失败\n${e.localizedMessage}")
}
} }
"myBookReplaceRule.json" -> } catch (e: Exception) {
try { App.INSTANCE.toast("导入源失败\n${e.localizedMessage}")
DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json -> }
val importCount = importOldReplaceRule(json) "myBookReplaceRule.json" ->
withContext(Dispatchers.Main) { try {
App.INSTANCE.toast("成功导入替换规则${importCount}") DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
} val importCount = importOldReplaceRule(json)
} App.INSTANCE.toast("成功导入替换规则${importCount}")
} catch (e: Exception) {
withContext(Dispatchers.Main) {
App.INSTANCE.toast("导入替换规则失败\n${e.localizedMessage}")
}
} }
} } catch (e: Exception) {
App.INSTANCE.toast("导入替换规则失败\n${e.localizedMessage}")
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save