From 3b8e8765ced7e28836db3cbc0a9cce9a988b0df9 Mon Sep 17 00:00:00 2001 From: gedoor Date: Sun, 12 Jul 2020 11:00:04 +0800 Subject: [PATCH] =?UTF-8?q?epub=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt | 2 +- .../main/java/io/legado/app/model/localBook/EPUBFile.kt | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt index 7e49ac677..8ecb6d6bd 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt @@ -378,7 +378,7 @@ class AnalyzeByJSoup { } "html" -> { elements.select("script, style").remove() - val html = elements.html() + val html = elements.outerHtml() textS.add(html) } "all" -> textS.add(elements.outerHtml()) diff --git a/app/src/main/java/io/legado/app/model/localBook/EPUBFile.kt b/app/src/main/java/io/legado/app/model/localBook/EPUBFile.kt index 2aafc1bc8..68ffd484f 100644 --- a/app/src/main/java/io/legado/app/model/localBook/EPUBFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/EPUBFile.kt @@ -93,9 +93,13 @@ class EPUBFile(val book: io.legado.app.data.entities.Book) { val resource = eBook.resources.getByHref(chapter.url) val doc = Jsoup.parse(String(resource.data, mCharset)) val elements = doc.body().children() - elements.select("script, style").remove() + elements.select("script").remove() + elements.select("style").remove() return elements.outerHtml() - .replace("]*>".toRegex(), "\n") + .replace("]*>".toRegex(), "\n") + .replace("\\s*\\n+\\s*".toRegex(), "\n  ") + .replace("^[\\n\\s]+".toRegex(), "  ") + .replace("[\\n\\s]+$".toRegex(), "") } return null }