Revert "优化"

This reverts commit 12b0bc5d
pull/1155/head
gedoor 3 years ago
parent 12b0bc5dca
commit 7f9a687328
  1. 9
      app/src/main/java/io/legado/app/utils/HtmlFormatter.kt

@ -26,8 +26,10 @@ object HtmlFormatter {
fun formatKeepImg(html: String?, redirectUrl: URL?): String { fun formatKeepImg(html: String?, redirectUrl: URL?): String {
html ?: return "" html ?: return ""
val keepImgHtml = formatKeepImg(html) val keepImgHtml = html.replace(wrapHtmlRegex, "\n")
.replace(notImgHtmlRegex, "")
.replace("\\n\\s*$|^\\s*\\n".toRegex(), "")
.replace("\\n\\s*\\n".toRegex(), "\n")
//正则的“|”处于顶端而不处于()中时,具有类似||的熔断效果,故以此机制简化原来的代码 //正则的“|”处于顶端而不处于()中时,具有类似||的熔断效果,故以此机制简化原来的代码
val matcher = formatImagePattern.matcher(keepImgHtml) val matcher = formatImagePattern.matcher(keepImgHtml)
var appendPos = 0 var appendPos = 0
@ -36,8 +38,7 @@ object HtmlFormatter {
var param = "" var param = ""
sb.append( sb.append(
keepImgHtml.substring(appendPos, matcher.start()), "<img src=\"${ keepImgHtml.substring(appendPos, matcher.start()), "<img src=\"${
NetworkUtils.getAbsoluteURL( NetworkUtils.getAbsoluteURL(redirectUrl,
redirectUrl,
matcher.group(1)?.let { matcher.group(1)?.let {
val urlMatcher = AnalyzeUrl.paramPattern.matcher(it) val urlMatcher = AnalyzeUrl.paramPattern.matcher(it)
if (urlMatcher.find()) { if (urlMatcher.find()) {

Loading…
Cancel
Save