yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2023-03-21 23:38:04 +08:00
parent 42300dc615
commit a45f6707bb
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt
+10 -5
View File
@@ -7,6 +7,7 @@ import com.jayway.jsonpath.JsonPath
import io.legado.app.R import io.legado.app.R
import io.legado.app.base.BaseViewModel import io.legado.app.base.BaseViewModel
import io.legado.app.constant.AppConst import io.legado.app.constant.AppConst
import io.legado.app.constant.AppLog
import io.legado.app.constant.AppPattern import io.legado.app.constant.AppPattern
import io.legado.app.data.appDb import io.legado.app.data.appDb
import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.BookSource
@@ -108,22 +109,26 @@ class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
} }
} }
} }
mText.isJsonArray() -> GSON.fromJsonArray<BookSource>(mText).getOrThrow().let { items -> mText.isJsonArray() -> {
allSources.addAll(items) GSON.fromJsonArray<BookSource>(mText).getOrThrow().let { items ->
allSources.addAll(items)
}
} }
mText.isAbsUrl() -> { mText.isAbsUrl() -> {
importSourceUrl(mText) importSourceUrl(mText)
} }
mText.isUri() -> { mText.isUri() -> {
val uri = Uri.parse(mText) val uri = Uri.parse(mText)
uri.inputStream(context).getOrThrow().let { uri.inputStream(context).getOrThrow().use {
allSources.addAll(GSON.fromJsonArray<BookSource>(it).getOrThrow()) GSON.fromJsonArray<BookSource>(it).getOrThrow().let {bookSources ->
allSources.addAll(bookSources)
}
} }
} }
else -> throw NoStackTraceException(context.getString(R.string.wrong_format)) else -> throw NoStackTraceException(context.getString(R.string.wrong_format))
} }
}.onError { }.onError {
it.printOnDebug() AppLog.put("读取书源出错", it)
errorLiveData.postValue(it.localizedMessage ?: "") errorLiveData.postValue(it.localizedMessage ?: "")
}.onSuccess { }.onSuccess {
comparisonSource() comparisonSource()
app/src/main/java/io/legado/app/utils/GsonExtensions.kt
+6 -6
View File
@@ -22,12 +22,12 @@ val GSON: Gson by lazy {
) )
.registerTypeAdapter(Int::class.java, IntJsonDeserializer()) .registerTypeAdapter(Int::class.java, IntJsonDeserializer())
.registerTypeAdapter(String::class.java, StringJsonDeserializer()) .registerTypeAdapter(String::class.java, StringJsonDeserializer())
.registerTypeAdapter(ExploreRule::class.java, ExploreRule.jsonDeserializer) // .registerTypeAdapter(ExploreRule::class.java, ExploreRule.jsonDeserializer)
.registerTypeAdapter(SearchRule::class.java, SearchRule.jsonDeserializer) // .registerTypeAdapter(SearchRule::class.java, SearchRule.jsonDeserializer)
.registerTypeAdapter(BookInfoRule::class.java, BookInfoRule.jsonDeserializer) // .registerTypeAdapter(BookInfoRule::class.java, BookInfoRule.jsonDeserializer)
.registerTypeAdapter(TocRule::class.java, TocRule.jsonDeserializer) // .registerTypeAdapter(TocRule::class.java, TocRule.jsonDeserializer)
.registerTypeAdapter(ContentRule::class.java, ContentRule.jsonDeserializer) // .registerTypeAdapter(ContentRule::class.java, ContentRule.jsonDeserializer)
.registerTypeAdapter(ReviewRule::class.java, ReviewRule.jsonDeserializer) // .registerTypeAdapter(ReviewRule::class.java, ReviewRule.jsonDeserializer)
.disableHtmlEscaping() .disableHtmlEscaping()
.setPrettyPrinting() .setPrettyPrinting()
.create() .create()