From e7948348094b72f5405a83a76deaba947bebaa1f Mon Sep 17 00:00:00 2001 From: bushixuanqi <57338301+bushixuanqi@users.noreply.github.com> Date: Sun, 13 Jun 2021 18:27:22 +0800 Subject: [PATCH] Update AppPattern.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化图片正则、书名正则、作者名正则 --- app/src/main/java/io/legado/app/constant/AppPattern.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/constant/AppPattern.kt b/app/src/main/java/io/legado/app/constant/AppPattern.kt index 0866b42d4..f6b5cd31b 100644 --- a/app/src/main/java/io/legado/app/constant/AppPattern.kt +++ b/app/src/main/java/io/legado/app/constant/AppPattern.kt @@ -7,11 +7,12 @@ object AppPattern { val JS_PATTERN: Pattern = Pattern.compile("([\\w\\W]*?|@js:[\\w\\W]*$)", Pattern.CASE_INSENSITIVE) val EXP_PATTERN: Pattern = Pattern.compile("\\{\\{([\\w\\W]*?)\\}\\}") + //图片有data-开头的数据属性时优先用数据属性作为src,没有数据属性时才匹配src val imgPattern: Pattern = - Pattern.compile("", Pattern.CASE_INSENSITIVE) + Pattern.compile("]*data-)src|(?=[^>]*data-)[^>]*data-[^= ]+) *= *\"((?:[^\"]|\\\\\")+)\"[^>]*>", Pattern.CASE_INSENSITIVE) - val nameRegex = Regex("\\s+作\\s*者.*") - val authorRegex = Regex(".*?作\\s*?者[::]") + val nameRegex = Regex("(?<=\\S)\\s+作\\s*者.*|\\s+\\S+\\s+著") + val authorRegex = Regex("^.*?作\\s*者[::\\s]*|\\s+著") val fileNameRegex = Regex("[\\\\/:*?\"<>|.]") val splitGroupRegex = Regex("[,;,;]") -} \ No newline at end of file +}