From d4af06747a7a93b7dd1f5f3d94feac15b15ceae1 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 18 Mar 2023 11:20:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../legado/app/help/source/SourceAnalyzer.kt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/source/SourceAnalyzer.kt b/app/src/main/java/io/legado/app/help/source/SourceAnalyzer.kt index dcd7a0fd3..17802511c 100644 --- a/app/src/main/java/io/legado/app/help/source/SourceAnalyzer.kt +++ b/app/src/main/java/io/legado/app/help/source/SourceAnalyzer.kt @@ -52,22 +52,19 @@ object SourceAnalyzer { val documentContext = jsonPath.parse(inputStream) try { val items: List> = documentContext.read("$") - for (item in items) { - val jsonItem = jsonPath.parse(item) - jsonToBookSource(jsonItem.jsonString()).getOrThrow().let { - bookSources.add(it) - } + items.map { + val jsonItem = jsonPath.parse(it) + jsonToBookSource(jsonItem.jsonString()).getOrThrow() } } catch (_: Exception) { val item: Map = documentContext.read("$") val jsonItem = jsonPath.parse(item) - jsonToBookSource(jsonItem.jsonString()).getOrThrow().let { - bookSources.add(it) - } - } catch (_: Exception) { - throw NoStackTraceException(appCtx.getString(R.string.wrong_format)) + mutableListOf( + jsonToBookSource(jsonItem.jsonString()).getOrThrow() + ) } - bookSources + }.onFailure { + throw NoStackTraceException(appCtx.getString(R.string.wrong_format)) } }