renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 本地导入没有包含在数组内的单个书源时无法解析

Browse Source
This commit is contained in:
Xwite
2023-03-18 09:07:22 +08:00
parent 22b56b542c
commit 6793aadbe1
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/io/legado/app/help/source/SourceAnalyzer.kt
View File

@@ -2,6 +2,7 @@ package io.legado.app.help.source
import androidx.annotation.Keep
import com.jayway.jsonpath.JsonPath
import io.legado.app.R
import io.legado.app.constant.AppConst
import io.legado.app.constant.AppLog
import io.legado.app.constant.BookSourceType
@@ -11,6 +12,8 @@ import io.legado.app.exception.NoStackTraceException
import io.legado.app.utils.*
import java.io.InputStream
import java.util.regex.Pattern
import splitties.init.appCtx
@Suppress("RegExpRedundantEscape")
object SourceAnalyzer {
@@ -36,7 +39,7 @@ object SourceAnalyzer {
}
}
else -> {
throw NoStackTraceException("格式不对")
throw NoStackTraceException(appCtx.getString(R.string.wrong_format))
}
}
bookSources
@@ -46,21 +49,24 @@ object SourceAnalyzer {
fun jsonToBookSources(inputStream: InputStream): Result<MutableList<BookSource>> {
return kotlin.runCatching {
val bookSources = mutableListOf<BookSource>()
// kotlin.runCatching {
val items: List<Map<String, Any>> = jsonPath.parse(inputStream).read("$")
val documentContext = jsonPath.parse(inputStream)
kotlin.runCatching {
val items: List<Map<String, Any> = documentContext.read("$")
for (item in items) {
val jsonItem = jsonPath.parse(item)
jsonToBookSource(jsonItem.jsonString()).getOrThrow().let {
bookSources.add(it)
}
}
// }.onFailure {
// val item: Map<String, Any> = jsonPath.parse(inputStream).read("$")
// val jsonItem = jsonPath.parse(item)
// jsonToBookSource(jsonItem.jsonString()).getOrThrow().let {
// bookSources.add(it)
// }
// }
}.onFailure {
val item: Map<String, Any> = documentContext.read("$")
val jsonItem = jsonPath.parse(item)
jsonToBookSource(jsonItem.jsonString()).getOrThrow().let {
bookSources.add(it)
}
}.onFailure {
throw NoStackTraceException(appCtx.getString(R.string.wrong_format))
}
bookSources
}
}
@@ -69,14 +75,14 @@ object SourceAnalyzer {
val source = BookSource()
val sourceAny = GSON.fromJsonObject<BookSourceAny>(json.trim())
.onFailure {
AppLog.put("转化书源出错", it)
AppLog.put(appCtx.getString(R.string.wrong_format), it)
}.getOrNull()
return kotlin.runCatching {
if (sourceAny?.ruleToc == null) {
source.apply {
val jsonItem = jsonPath.parse(json.trim())
bookSourceUrl = jsonItem.readString("bookSourceUrl")
?: throw NoStackTraceException("格式不对")
?: throw NoStackTraceException(appCtx.getString(R.string.wrong_format))
bookSourceName = jsonItem.readString("bookSourceName") ?: ""
bookSourceGroup = jsonItem.readString("bookSourceGroup")
loginUrl = jsonItem.readString("loginUrl")