gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-17 00:58:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei 2023-03-02 10:05:11 +08:00
parent 57ebf6d10b
commit 323854f647
13 changed files with 64 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/io/legado/app/api/controller/BookSourceController.kt
View File

@ -68,7 +68,7 @@ object BookSourceController {
fun deleteSources(postData: String?): ReturnData {
kotlin.runCatching {
GSON.fromJsonArray<BookSource>(postData).getOrThrow()?.let {
GSON.fromJsonArray<BookSource>(postData).getOrThrow().let {
it.forEach { source ->
appDb.bookSourceDao.delete(source)
SourceConfig.removeSource(source.bookSourceUrl)

81
app/src/main/java/io/legado/app/data/entities/RssSource.kt
View File

@ -3,10 +3,13 @@ package io.legado.app.data.entities
import android.os.Parcelable
import android.text.TextUtils
import androidx.room.*
import com.jayway.jsonpath.DocumentContext
import com.google.gson.JsonDeserializationContext
import com.google.gson.JsonDeserializer
import com.google.gson.JsonElement
import io.legado.app.constant.AppPattern
import io.legado.app.utils.*
import kotlinx.parcelize.Parcelize
import java.lang.reflect.Type
@Parcelize
@Entity(tableName = "rssSources", indices = [(Index(value = ["sourceUrl"], unique = false))])
@ -171,65 +174,35 @@ data class RssSource(
@Suppress("MemberVisibilityCanBePrivate")
companion object {
fun fromJsonDoc(doc: DocumentContext): Result<RssSource> {
return kotlin.runCatching {
val loginUi = doc.read<Any>("$.loginUi")
RssSource(
sourceUrl = doc.readString("$.sourceUrl")!!,
sourceName = doc.readString("$.sourceName")!!,
sourceIcon = doc.readString("$.sourceIcon") ?: "",
sourceGroup = doc.readString("$.sourceGroup"),
sourceComment = doc.readString("$.sourceComment"),
enabled = doc.readBool("$.enabled") ?: true,
concurrentRate = doc.readString("$.concurrentRate"),
header = doc.readString("$.header"),
loginUrl = doc.readString("$.loginUrl"),
loginUi = if (loginUi is List<*>) GSON.toJson(loginUi) else loginUi?.toString(),
loginCheckJs = doc.readString("$.loginCheckJs"),
sortUrl = doc.readString("$.sortUrl"),
singleUrl = doc.readBool("$.singleUrl") ?: false,
articleStyle = doc.readInt("$.articleStyle") ?: 0,
ruleArticles = doc.readString("$.ruleArticles"),
ruleNextPage = doc.readString("$.ruleNextPage"),
ruleTitle = doc.readString("$.ruleTitle"),
rulePubDate = doc.readString("$.rulePubDate"),
ruleDescription = doc.readString("$.ruleDescription"),
ruleImage = doc.readString("$.ruleImage"),
ruleLink = doc.readString("$.ruleLink"),
ruleContent = doc.readString("$.ruleContent"),
style = doc.readString("$.style"),
injectJs = doc.readString("$.injectJs"),
enableJs = doc.readBool("$.enableJs") ?: true,
loadWithBaseUrl = doc.readBool("$.loadWithBaseUrl") ?: true,
enabledCookieJar = doc.readBool("$.enabledCookieJar") ?: false,
customOrder = doc.readInt("$.customOrder") ?: 0,
lastUpdateTime = doc.readLong("$.lastUpdateTime") ?: 0L,
coverDecodeJs = doc.readString("$.coverDecodeJs"),
variableComment = doc.readString("$.variableComment"),
contentBlacklist = doc.readString("$.contentBlacklist"),
contentWhitelist = doc.readString("$.contentWhitelist")
)
}
private val gson by lazy {
GSON.newBuilder()
.registerTypeAdapter(String::class.java, RssJsonDeserializer())
.create()
}
fun fromJson(json: String): Result<RssSource> {
return fromJsonDoc(jsonPath.parse(json))
return gson.fromJsonObject(json)
}
fun fromJsonArray(jsonArray: String): Result<ArrayList<RssSource>> {
return kotlin.runCatching {
val sources = arrayListOf<RssSource>()
val doc = jsonPath.parse(jsonArray).read<List<*>>("$")
doc.forEach {
val jsonItem = jsonPath.parse(it)
fromJsonDoc(jsonItem).getOrThrow().let { source ->
sources.add(source)
}
}
sources
}
fun fromJsonArray(jsonArray: String): Result<List<RssSource>> {
return gson.fromJsonArray(jsonArray)
}
}
class RssJsonDeserializer : JsonDeserializer<String?> {
override fun deserialize(
json: JsonElement,
typeOfT: Type?,
context: JsonDeserializationContext?
): String? {
return when {
json.isJsonPrimitive -> json.asString
json.isJsonNull -> null
else -> json.toString()
}
}
}
}

6
app/src/main/java/io/legado/app/help/DefaultData.kt
View File

@ -87,7 +87,7 @@ object DefaultData {
appCtx.assets.open("defaultData${File.separator}coverRule.json")
.readBytes()
)
GSON.fromJsonObject<BookCover.CoverRule>(json).getOrThrow()!!
GSON.fromJsonObject<BookCover.CoverRule>(json).getOrThrow()
}
val dictRules: List<DictRule> by lazy {
@ -95,7 +95,7 @@ object DefaultData {
appCtx.assets.open("defaultData${File.separator}dictRules.json")
.readBytes()
)
GSON.fromJsonArray<DictRule>(json).getOrThrow()!!
GSON.fromJsonArray<DictRule>(json).getOrThrow()
}
val keyboardAssists: List<KeyboardAssist> by lazy {
@ -103,7 +103,7 @@ object DefaultData {
appCtx.assets.open("defaultData${File.separator}keyboardAssists.json")
.readBytes()
)
GSON.fromJsonArray<KeyboardAssist>(json).getOrNull()!!
GSON.fromJsonArray<KeyboardAssist>(json).getOrThrow()
}
fun importDefaultHttpTTS() {

2
app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt
View File

@ -50,7 +50,7 @@ suspend fun BookSource.exploreKinds(): List<ExploreKind> {
}
}
if (ruleStr.isJsonArray()) {
GSON.fromJsonArray<ExploreKind?>(ruleStr).getOrThrow()?.let {
GSON.fromJsonArray<ExploreKind?>(ruleStr).getOrThrow().let {
kinds.addAll(it.filterNotNull())
}
} else {

2
app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
View File

@ -218,7 +218,7 @@ object LocalBook {
SimpleBindings().also { it["src"] = tempFileName }
).toString()
val bookMess = GSON.fromJsonObject<HashMap<String, String>>(jsonStr)
.getOrThrow() ?: HashMap()
.getOrThrow()
name = bookMess["name"] ?: tempFileName
author = bookMess["author"]?.takeIf { it.length != tempFileName.length } ?: ""
} catch (e: Exception) {

4
app/src/main/java/io/legado/app/ui/association/ImportDictRuleViewModel.kt
View File

@ -71,11 +71,11 @@ class ImportDictRuleViewModel(app: Application) : BaseViewModel(app) {
private suspend fun importSourceAwait(text: String) {
when {
text.isJsonObject() -> {
GSON.fromJsonObject<DictRule>(text).getOrThrow()?.let {
GSON.fromJsonObject<DictRule>(text).getOrThrow().let {
allSources.add(it)
}
}
text.isJsonArray() -> GSON.fromJsonArray<DictRule>(text).getOrThrow()?.let { items ->
text.isJsonArray() -> GSON.fromJsonArray<DictRule>(text).getOrThrow().let { items ->
allSources.addAll(items)
}
text.isAbsUrl() -> {

8
app/src/main/java/io/legado/app/ui/association/ImportRssSourceViewModel.kt
View File

@ -104,12 +104,8 @@ class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) {
}
}
mText.isJsonArray() -> {
val items: List<Map<String, Any>> = jsonPath.parse(mText).read("$")
for (item in items) {
val jsonItem = jsonPath.parse(item)
RssSource.fromJsonDoc(jsonItem).getOrThrow().let {
allSources.add(it)
}
RssSource.fromJsonArray(mText).getOrThrow().let {
allSources.addAll(it)
}
}
mText.isAbsUrl() -> {

4
app/src/main/java/io/legado/app/ui/association/ImportThemeViewModel.kt
View File

@ -68,12 +68,12 @@ class ImportThemeViewModel(app: Application) : BaseViewModel(app) {
private suspend fun importSourceAwait(text: String) {
when {
text.isJsonObject() -> {
GSON.fromJsonObject<ThemeConfig.Config>(text).getOrThrow()?.let {
GSON.fromJsonObject<ThemeConfig.Config>(text).getOrThrow().let {
allSources.add(it)
}
}
text.isJsonArray() -> GSON.fromJsonArray<ThemeConfig.Config>(text).getOrThrow()
?.let { items ->
.let { items ->
allSources.addAll(items)
}
text.isAbsUrl() -> {

4
app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleViewModel.kt
View File

@ -71,12 +71,12 @@ class ImportTxtTocRuleViewModel(app: Application) : BaseViewModel(app) {
private suspend fun importSourceAwait(text: String) {
when {
text.isJsonObject() -> {
GSON.fromJsonObject<TxtTocRule>(text).getOrThrow()?.let {
GSON.fromJsonObject<TxtTocRule>(text).getOrThrow().let {
allSources.add(it)
}
}
text.isJsonArray() -> GSON.fromJsonArray<TxtTocRule>(text).getOrThrow()
?.let { items ->
.let { items ->
allSources.addAll(items)
}
text.isAbsUrl() -> {

3
app/src/main/java/io/legado/app/ui/book/toc/rule/TxtTocRuleViewModel.kt
View File

@ -3,7 +3,6 @@ package io.legado.app.ui.book.toc.rule
import android.app.Application
import io.legado.app.base.BaseViewModel
import io.legado.app.data.appDb
import io.legado.app.data.entities.DictRule
import io.legado.app.data.entities.TxtTocRule
import io.legado.app.help.DefaultData
import io.legado.app.help.http.newCallResponseBody
@ -43,7 +42,7 @@ class TxtTocRuleViewModel(app: Application) : BaseViewModel(app) {
okHttpClient.newCallResponseBody {
url(url)
}.text("utf-8").let { json ->
GSON.fromJsonArray<TxtTocRule>(json).getOrThrow()?.let {
GSON.fromJsonArray<TxtTocRule>(json).getOrThrow().let {
appDb.txtTocRuleDao.insert(*it.toTypedArray())
}
}

2
app/src/main/java/io/legado/app/ui/dict/rule/DictRuleEditDialog.kt
View File

@ -109,7 +109,7 @@ class DictRuleEditDialog() : BaseDialogFragment(R.layout.dialog_dict_rule_edit,
return
}
execute {
GSON.fromJsonObject<DictRule>(text).getOrThrow()!!
GSON.fromJsonObject<DictRule>(text).getOrThrow()
}.onSuccess {
success.invoke(it)
}.onError {

2
app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt
View File

@ -125,7 +125,7 @@ class BookshelfViewModel(application: Application) : BaseViewModel(application)
private fun importBookshelfByJson(json: String, groupId: Long) {
execute {
val bookSources = appDb.bookSourceDao.allEnabled
GSON.fromJsonArray<Map<String, String?>>(json).getOrThrow()?.forEach { bookInfo ->
GSON.fromJsonArray<Map<String, String?>>(json).getOrThrow().forEach { bookInfo ->
if (!isActive) return@execute
val name = bookInfo["name"] ?: ""
val author = bookInfo["author"] ?: ""

28
app/src/main/java/io/legado/app/utils/GsonExtensions.kt
View File

@ -27,29 +27,41 @@ val GSON: Gson by lazy {
inline fun <reified T> genericType(): Type = object : TypeToken<T>() {}.type
inline fun <reified T> Gson.fromJsonObject(json: String?): Result<T?> {
inline fun <reified T> Gson.fromJsonObject(json: String?): Result<T> {
return kotlin.runCatching {
fromJson(json, genericType<T>()) as? T
if (json == null) {
throw JsonSyntaxException("解析字符串为空")
}
fromJson(json, genericType<T>()) as T
}
}
inline fun <reified T> Gson.fromJsonArray(json: String?): Result<List<T>?> {
inline fun <reified T> Gson.fromJsonArray(json: String?): Result<List<T>> {
return kotlin.runCatching {
fromJson(json, ParameterizedTypeImpl(T::class.java)) as? List<T>
if (json == null) {
throw JsonSyntaxException("解析字符串为空")
}
fromJson(json, ParameterizedTypeImpl(T::class.java)) as List<T>
}
}
inline fun <reified T> Gson.fromJsonObject(inputStream: InputStream?): Result<T?> {
inline fun <reified T> Gson.fromJsonObject(inputStream: InputStream?): Result<T> {
return kotlin.runCatching {
if (inputStream == null) {
throw JsonSyntaxException("解析流为空")
}
val reader = InputStreamReader(inputStream)
fromJson(reader, genericType<T>()) as? T
fromJson(reader, genericType<T>()) as T
}
}
inline fun <reified T> Gson.fromJsonArray(inputStream: InputStream?): Result<List<T>?> {
inline fun <reified T> Gson.fromJsonArray(inputStream: InputStream?): Result<List<T>> {
return kotlin.runCatching {
if (inputStream == null) {
throw JsonSyntaxException("解析流为空")
}
val reader = InputStreamReader(inputStream)
fromJson(reader, ParameterizedTypeImpl(T::class.java)) as? List<T>
fromJson(reader, ParameterizedTypeImpl(T::class.java)) as List<T>
}
}