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

优化

Browse Source
This commit is contained in:
kunfei
2023-03-22 16:22:23 +08:00
parent 1953a4602b
commit 87ff230bac
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt
+8 -4
View File
@@ -91,16 +91,20 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat
text1?.let { importSource(text1) } text1?.let { importSource(text1) }
} }
text.isJsonArray() -> { text.isJsonArray() -> {
val items: List<Map<String, Any>> = jsonPath.parse(text).read("$") if (text.contains("ruleSearchUrl") || text.contains("ruleFindUrl")) {
val jsonItem = jsonPath.parse(items[0]) val items: List<Map<String, Any>> = jsonPath.parse(text).read("$")
BookSource.fromJson(jsonItem.jsonString()).getOrElse { val jsonItem = jsonPath.parse(items[0])
ImportOldData.fromOldBookSource(jsonItem) ImportOldData.fromOldBookSource(jsonItem)
} else {
BookSource.fromJsonArray(text).getOrThrow()[0]
} }
} }
text.isJsonObject() -> { text.isJsonObject() -> {
BookSource.fromJson(text).getOrElse { if (text.contains("ruleSearchUrl") || text.contains("ruleFindUrl")) {
val jsonItem = jsonPath.parse(text) val jsonItem = jsonPath.parse(text)
ImportOldData.fromOldBookSource(jsonItem) ImportOldData.fromOldBookSource(jsonItem)
} else {
BookSource.fromJson(text).getOrThrow()
} }
} }
else -> throw NoStackTraceException("格式不对") else -> throw NoStackTraceException("格式不对")