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:
Horis
2023-01-12 22:20:06 +08:00
parent bdff1b2274
commit 0d6c2b890f
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/constant/AppPattern.kt
+2
View File
@@ -39,4 +39,6 @@ object AppPattern {
* 不发音段落判断 * 不发音段落判断
*/ */
val notReadAloudRegex = Regex("^(\\s|\\p{C}|\\p{P}|\\p{Z}|\\p{S})+$") val notReadAloudRegex = Regex("^(\\s|\\p{C}|\\p{P}|\\p{Z}|\\p{S})+$")
val xmlContentTypeRegex = "(application|text)/\\w*\\+?xml.*".toRegex()
} }
app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
+2 -1
View File
@@ -8,6 +8,7 @@ import com.bumptech.glide.load.model.GlideUrl
import com.script.SimpleBindings import com.script.SimpleBindings
import io.legado.app.constant.AppConst.SCRIPT_ENGINE import io.legado.app.constant.AppConst.SCRIPT_ENGINE
import io.legado.app.constant.AppConst.UA_NAME import io.legado.app.constant.AppConst.UA_NAME
import io.legado.app.constant.AppPattern
import io.legado.app.constant.AppPattern.JS_PATTERN import io.legado.app.constant.AppPattern.JS_PATTERN
import io.legado.app.constant.AppPattern.dataUriRegex import io.legado.app.constant.AppPattern.dataUriRegex
import io.legado.app.data.entities.BaseSource import io.legado.app.data.entities.BaseSource
@@ -422,7 +423,7 @@ class AnalyzeUrl(
} }
}.let { }.let {
val isXml = it.raw.body?.contentType()?.toString() val isXml = it.raw.body?.contentType()?.toString()
?.matches("(application|text)/\\w*\\+?xml.*".toRegex()) == true ?.matches(AppPattern.xmlContentTypeRegex) == true
if (isXml && it.body?.trim()?.startsWith("<?xml", true) == false) { if (isXml && it.body?.trim()?.startsWith("<?xml", true) == false) {
StrResponse(it.raw, "<?xml version=\"1.0\"?>" + it.body) StrResponse(it.raw, "<?xml version=\"1.0\"?>" + it.body)
} else it } else it
app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
+3 -2
View File
@@ -190,7 +190,8 @@ class EpubFile(var book: Book) {
} }
private fun getBody(res: Resource, startFragmentId: String?, endFragmentId: String?): Element { private fun getBody(res: Resource, startFragmentId: String?, endFragmentId: String?): Element {
val body = Jsoup.parse(String(res.data, mCharset)).body() val doc = Jsoup.parse(String(res.data, mCharset))
val body = doc.body()
if (!startFragmentId.isNullOrBlank()) { if (!startFragmentId.isNullOrBlank()) {
body.getElementById(startFragmentId)?.previousElementSiblings()?.remove() body.getElementById(startFragmentId)?.previousElementSiblings()?.remove()
} }
@@ -215,7 +216,7 @@ class EpubFile(var book: Book) {
val children = body.children() val children = body.children()
children.select("script").remove() children.select("script").remove()
children.select("style").remove() children.select("style").remove()
return body return doc.body()
} }
private fun getImage(href: String): InputStream? { private fun getImage(href: String): InputStream? {