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

优化

Browse Source
This commit is contained in:
kunfei
2022-03-31 17:09:52 +08:00
parent 518781985b
commit b477f2eecb
7 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import io.legado.app.data.appDb
import io.legado.app.data.entities.BookSource
import io.legado.app.utils.GSON
import io.legado.app.utils.fromJsonArray
import io.legado.app.utils.msg
object BookSourceController {
@@ -23,20 +22,16 @@ object BookSourceController {
fun saveSource(postData: String?): ReturnData {
val returnData = ReturnData()
postData ?: return returnData.setErrorMsg("数据不能为空")
kotlin.runCatching {
val bookSource = BookSource.fromJson(postData)
if (bookSource != null) {
if (TextUtils.isEmpty(bookSource.bookSourceName) || TextUtils.isEmpty(bookSource.bookSourceUrl)) {
returnData.setErrorMsg("源名称和URL不能为空")
} else {
appDb.bookSourceDao.insert(bookSource)
returnData.setData("")
}
val bookSource = BookSource.fromJson(postData).getOrNull()
if (bookSource != null) {
if (TextUtils.isEmpty(bookSource.bookSourceName) || TextUtils.isEmpty(bookSource.bookSourceUrl)) {
returnData.setErrorMsg("源名称和URL不能为空")
} else {
returnData.setErrorMsg("转换源失败")
appDb.bookSourceDao.insert(bookSource)
returnData.setData("")
}
}.onFailure {
returnData.setErrorMsg(it.msg)
} else {
returnData.setErrorMsg("转换源失败")
}
return returnData
}
@@ -44,19 +39,18 @@ object BookSourceController {
fun saveSources(postData: String?): ReturnData {
postData ?: return ReturnData().setErrorMsg("数据为空")
val okSources = arrayListOf<BookSource>()
val bookSources = BookSource.fromJsonArray(postData)
if (bookSources.isNotEmpty()) {
bookSources.forEach { bookSource ->
if (bookSource.bookSourceName.isNotBlank()
&& bookSource.bookSourceUrl.isNotBlank()
) {
appDb.bookSourceDao.insert(bookSource)
okSources.add(bookSource)
}
}
} else {
val bookSources = BookSource.fromJsonArray(postData).getOrNull()
if (bookSources.isNullOrEmpty()) {
return ReturnData().setErrorMsg("转换源失败")
}
bookSources.forEach { bookSource ->
if (bookSource.bookSourceName.isNotBlank()
&& bookSource.bookSourceUrl.isNotBlank()
) {
appDb.bookSourceDao.insert(bookSource)
okSources.add(bookSource)
}
}
return ReturnData().setData(okSources)
}

4
app/src/main/java/io/legado/app/data/entities/BookSource.kt
View File

@@ -204,11 +204,11 @@ data class BookSource(
companion object {
fun fromJson(json: String): BookSource? {
fun fromJson(json: String): Result<BookSource> {
return SourceAnalyzer.jsonToBookSource(json)
}
fun fromJsonArray(json: String): List<BookSource> {
fun fromJsonArray(json: String): Result<MutableList<BookSource>> {
return SourceAnalyzer.jsonToBookSources(json)
}

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

@@ -7,6 +7,7 @@ import io.legado.app.constant.AppLog
import io.legado.app.constant.BookType
import io.legado.app.data.entities.BookSource
import io.legado.app.data.entities.rule.*
import io.legado.app.exception.NoStackTraceException
import io.legado.app.utils.*
import java.io.InputStream
@@ -17,16 +18,30 @@ object SourceAnalyzer {
private val headerPattern = Pattern.compile("@Header:\\{.+?\\}", Pattern.CASE_INSENSITIVE)
private val jsPattern = Pattern.compile("\\{\\{.+?\\}\\}", Pattern.CASE_INSENSITIVE)
fun jsonToBookSources(json: String): List<BookSource> {
val bookSources = mutableListOf<BookSource>()
val items: List<Map<String, Any>> = jsonPath.parse(json).read("$")
for (item in items) {
val jsonItem = jsonPath.parse(item)
jsonToBookSource(jsonItem.jsonString())?.let {
bookSources.add(it)
fun jsonToBookSources(json: String): Result<MutableList<BookSource>> {
return kotlin.runCatching {
val bookSources = mutableListOf<BookSource>()
when {
json.isJsonArray() -> {
val items: List<Map<String, Any>> = jsonPath.parse(json).read("$")
for (item in items) {
val jsonItem = jsonPath.parse(item)
jsonToBookSource(jsonItem.jsonString()).getOrThrow().let {
bookSources.add(it)
}
}
}
json.isJsonObject() -> {
jsonToBookSource(json).getOrThrow().let {
bookSources.add(it)
}
}
else -> {
throw NoStackTraceException("格式不对")
}
}
bookSources
}
return bookSources
}
fun jsonToBookSources(inputStream: InputStream): Result<MutableList<BookSource>> {
@@ -36,14 +51,14 @@ object SourceAnalyzer {
val items: List<Map<String, Any>> = jsonPath.parse(inputStream).read("$")
for (item in items) {
val jsonItem = jsonPath.parse(item)
jsonToBookSource(jsonItem.jsonString())?.let {
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())?.let {
jsonToBookSource(jsonItem.jsonString()).getOrThrow().let {
bookSources.add(it)
}
}
@@ -51,17 +66,18 @@ object SourceAnalyzer {
}
}
fun jsonToBookSource(json: String): BookSource? {
fun jsonToBookSource(json: String): Result<BookSource> {
val source = BookSource()
val sourceAny = GSON.fromJsonObject<BookSourceAny>(json.trim())
.onFailure {
AppLog.put("转化书源出错", it)
}.getOrNull()
try {
return kotlin.runCatching {
if (sourceAny?.ruleToc == null) {
source.apply {
val jsonItem = jsonPath.parse(json.trim())
bookSourceUrl = jsonItem.readString("bookSourceUrl") ?: return null
bookSourceUrl = jsonItem.readString("bookSourceUrl")
?: throw NoStackTraceException("格式不对")
bookSourceName = jsonItem.readString("bookSourceName") ?: ""
bookSourceGroup = jsonItem.readString("bookSourceGroup")
loginUrl = jsonItem.readString("loginUrl")
@@ -189,10 +205,8 @@ object SourceAnalyzer {
.getOrNull()
}
}
} catch (e: Exception) {
e.printOnDebug()
source
}
return source
}
@Keep

7
app/src/main/java/io/legado/app/help/storage/ImportOldData.kt
View File

@@ -91,9 +91,10 @@ object ImportOldData {
}
fun importOldSource(json: String): Int {
val bookSources = BookSource.fromJsonArray(json)
appDb.bookSourceDao.insert(*bookSources.toTypedArray())
return bookSources.size
val count = BookSource.fromJsonArray(json).onSuccess {
appDb.bookSourceDao.insert(*it.toTypedArray())
}.getOrNull()?.size
return count ?: 0
}
private fun importOldReplaceRule(json: String): Int {

2
app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt
View File

@@ -189,7 +189,7 @@ class ImportBookSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie
override fun onCodeSave(code: String, requestId: String?) {
requestId?.toInt()?.let {
BookSource.fromJson(code)?.let { source ->
BookSource.fromJson(code).getOrNull()?.let { source ->
viewModel.allSources[it] = source
adapter.setItem(it, source)
}

5
app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt
View File

@@ -97,13 +97,12 @@ class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
importSourceUrl(it)
}
} else {
BookSource.fromJson(mText)?.let {
BookSource.fromJson(mText).getOrThrow().let {
allSources.add(it)
}
}
}
mText.isJsonArray() -> {
val items = BookSource.fromJsonArray(mText)
mText.isJsonArray() -> BookSource.fromJsonArray(mText).getOrThrow().let { items ->
allSources.addAll(items)
}
mText.isAbsUrl() -> {

8
app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditViewModel.kt
View File

@@ -86,14 +86,12 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat
text.isJsonArray() -> {
val items: List<Map<String, Any>> = jsonPath.parse(text).read("$")
val jsonItem = jsonPath.parse(items[0])
BookSource.fromJson(jsonItem.jsonString())
BookSource.fromJson(jsonItem.jsonString()).getOrThrow()
}
text.isJsonObject() -> {
BookSource.fromJson(text)
}
else -> {
null
BookSource.fromJson(text).getOrThrow()
}
else -> throw NoStackTraceException("格式不对")
}
}