k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1132 from bushixuanqi/master

Browse Source 
不破坏原文布局格式
pull/1133/head
kunfei 3 years ago committed by GitHub
parent b1d73f9bc2 1378ce67bf
commit af7be0b8d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 37 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 54
      app/src/main/java/io/legado/app/utils/HtmlFormatter.kt

54
app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
Unescape View File

@ -22,7 +22,10 @@ object HtmlFormatter {
fun formatKeepImg(html: String?, redirectUrl: URL?): String { fun formatKeepImg(html: String?, redirectUrl: URL?): String {
html ?: return "" html ?: return ""
val keepImgHtml = format(html, notImgHtmlRegex) val keepImgHtml = html.replace(wrapHtmlRegex, "\n")
.replace(notImgHtmlRegex, "")
.replace("\\n\\s*$|^\\s*\\n".toRegex(), "")
.replace("\\n\\s*\\n".toRegex(), "\n")
var str = StringBuffer() var str = StringBuffer()
var endPos = 0 var endPos = 0
@ -47,28 +50,20 @@ object HtmlFormatter {
var appendPos0 = 0 var appendPos0 = 0
val matcher0 = Pattern.compile("<img[^>]*src *= *\"([^\"]+)\"[^>]*>", Pattern.CASE_INSENSITIVE).matcher(strBefore) //格式化普通图片标签 val matcher0 = Pattern.compile("<img[^>]*src *= *\"([^\"]+)\"[^>]*>", Pattern.CASE_INSENSITIVE).matcher(strBefore) //格式化普通图片标签
while (matcher0.find()) { while (matcher0.find()) {
val strBefore0 = strBefore.substring(appendPos0, matcher0.start()) sb.append(strBefore.substring(appendPos0, matcher0.start()),"<img src=\"${NetworkUtils.getAbsoluteURL(redirectUrl,matcher0.group(1)!!)}\">")
sb.append( if (strBefore0.isBlank()) strBefore0 else strBefore0.replace("\n","\n　　"))
sb.append("<img src=\"${NetworkUtils.getAbsoluteURL(redirectUrl,matcher0.group(1)!!)}\">")
appendPos0 = matcher0.end() appendPos0 = matcher0.end()
} }
strBefore = if (appendPos0 < strBefore.length) strBefore.substring(appendPos0, strBefore.length) else "" strBefore = strBefore.substring(appendPos0, strBefore.length)
} }
sb.append( sb.append( strBefore,"<img src=\"${
if (strBefore.isBlank()) strBefore else strBefore.replace("\n","\n　　") //缩进图片之间的非空白段落 if (pos == 0) {
) val url = matcher.group(1)!!
val urlMatcher = AnalyzeUrl.paramPattern.matcher(url)
if (pos == 0) { if(urlMatcher.find()) NetworkUtils.getAbsoluteURL(redirectUrl,url.substring(0,urlMatcher.start())) + ',' + url.substring(urlMatcher.end())
val url = matcher.group(1)!!
val urlMatcher = AnalyzeUrl.paramPattern.matcher(url)
val find = urlMatcher.find()
sb.append("<img src=\"${
if(find) NetworkUtils.getAbsoluteURL(redirectUrl,url.substring(0,urlMatcher.start())) + ',' + url.substring(urlMatcher.end())
else url else url
}\">") }else NetworkUtils.getAbsoluteURL(redirectUrl,matcher.group(1)!!)
}\">")
} else sb.append("<img src=\"${NetworkUtils.getAbsoluteURL(redirectUrl,matcher.group(1)!!)}\">")
appendPos = matcher.end() appendPos = matcher.end()
} while (matcher.find()) } while (matcher.find())
@ -83,7 +78,7 @@ object HtmlFormatter {
} }
if (endPos < keepImgHtml.length) { if (endPos < keepImgHtml.length) {
str.append( ( str.append(
if(hasMatchX){ //处理末尾的普通图片标签 if(hasMatchX){ //处理末尾的普通图片标签
var appendPos0 = 0 var appendPos0 = 0
val strBefore = keepImgHtml.substring(endPos, keepImgHtml.length) val strBefore = keepImgHtml.substring(endPos, keepImgHtml.length)
@ -91,28 +86,13 @@ object HtmlFormatter {
Pattern.compile("<img[^>]*src *= *\"([^\"]+)\"[^>]*>", Pattern.CASE_INSENSITIVE) Pattern.compile("<img[^>]*src *= *\"([^\"]+)\"[^>]*>", Pattern.CASE_INSENSITIVE)
.matcher(strBefore) //格式化普通图片标签 .matcher(strBefore) //格式化普通图片标签
while (matcher0.find()) { while (matcher0.find()) {
val strBefore0 = strBefore.substring(appendPos0, matcher0.start()) str.append(strBefore.substring(appendPos0, matcher0.start()),"<img src=\"${ NetworkUtils.getAbsoluteURL( redirectUrl, matcher0.group(1)!! ) }\">")
str.append(
if (strBefore0.isBlank()) strBefore0 else strBefore0.replace(
"\n",
"\n　　"
)
)
str.append(
"<img src=\"${
NetworkUtils.getAbsoluteURL(
redirectUrl,
matcher0.group(1)!!
)
}\">"
)
appendPos0 = matcher0.end() appendPos0 = matcher0.end()
} }
if (appendPos0 < strBefore.length) strBefore.substring( appendPos0, strBefore.length ) else "" strBefore.substring( appendPos0, strBefore.length )
}else keepImgHtml.substring( endPos, keepImgHtml.length ) }else keepImgHtml.substring( endPos, keepImgHtml.length )
).replace("\n","\n　　") ) //缩进图片之后的非空白段落 ) //缩进图片之后的非空白段落
} }
return str.toString() return str.toString()
} }
} }

Write Preview
Loading…
Cancel
Save