Merge pull request #1869 from Xwite/master

fix(书源导入):no path $.sourceUrls find
3 years ago · b404a1831e
parent 5e331f4b94 eee9097273
commit b404a1831e
1 changed files with 6 additions and 5 deletions
--- a/app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt
@ -90,13 +90,14 @@ class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
            val mText = text.trim()
            when {
                mText.isJsonObject() -> {
-                    val json = JsonPath.parse(mText)
-                    val urls = json.read<List<String>>("$.sourceUrls")
-                    if (!urls.isNullOrEmpty()) {
-                        urls.forEach {
+                    kotlin.runCatching {
+                        val json = JsonPath.parse(mText)
+                        json.read<List<String>>("$.sourceUrls")
+                    }.onSuccess {
+                        it.forEach {
                            importSourceUrl(it)
                        }
-                    } else {
+                    }.onFailure {
                        BookSource.fromJson(mText).getOrThrow().let {
                            allSources.add(it)
                        }