pull/1575/head
kunfei 3 years ago
parent 42fe73ac35
commit f5d0e22eaa
  1. 2
      app/src/main/java/io/legado/app/data/entities/BookSource.kt
  2. 3
      app/src/main/java/io/legado/app/help/SourceAnalyzer.kt

@ -136,7 +136,7 @@ data class BookSource(
fun hasGroup(group: String): Boolean { fun hasGroup(group: String): Boolean {
bookSourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.toHashSet()?.let { bookSourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.toHashSet()?.let {
return if (it.indexOf(group) != -1) true else false return it.indexOf(group) != -1
} }
return false return false
} }

@ -7,6 +7,7 @@ import io.legado.app.constant.BookType
import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.BookSource
import io.legado.app.data.entities.rule.* import io.legado.app.data.entities.rule.*
import io.legado.app.utils.* import io.legado.app.utils.*
import splitties.init.appCtx
import timber.log.Timber import timber.log.Timber
import java.util.regex.Pattern import java.util.regex.Pattern
@ -17,6 +18,7 @@ object SourceAnalyzer {
fun jsonToBookSources(json: String): List<BookSource> { fun jsonToBookSources(json: String): List<BookSource> {
val bookSources = mutableListOf<BookSource>() val bookSources = mutableListOf<BookSource>()
if (json.isJsonArray()) {
val items: List<Map<String, Any>> = jsonPath.parse(json).read("$") val items: List<Map<String, Any>> = jsonPath.parse(json).read("$")
for (item in items) { for (item in items) {
val jsonItem = jsonPath.parse(item) val jsonItem = jsonPath.parse(item)
@ -24,6 +26,7 @@ object SourceAnalyzer {
bookSources.add(it) bookSources.add(it)
} }
} }
}
return bookSources return bookSources
} }

Loading…
Cancel
Save