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

Merge remote-tracking branch 'origin/master'

Browse Source
pull/951/head
gedoor 4 years ago
parent db0f89d0d8 8812278b6a
commit b00e1ab4ed
1 changed files with 3 additions and 5 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. 8
      app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt

8
app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt vendored
Unescape View File

@ -130,7 +130,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
val matches = AppPattern.imgPattern.toRegex().findAll(input = text) val matches = AppPattern.imgPattern.toRegex().findAll(input = text)
matches.forEach { matchResult -> matches.forEach { matchResult ->
matchResult.groupValues[1].let { matchResult.groupValues[1].let {
val src=NetworkUtils.getAbsoluteURL(chapter.url, it) val src = NetworkUtils.getAbsoluteURL(chapter.url, it)
srcList.add(Triple(chapter.title, index, src)) srcList.add(Triple(chapter.title, index, src))
} }
} }
@ -243,10 +243,8 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
BookHelp.getContent(book, chapter).let { content -> BookHelp.getContent(book, chapter).let { content ->
var content1 = fixPic(epubBook, book, content ?: "null", chapter) var content1 = fixPic(epubBook, book, content ?: "null", chapter)
content1 = contentProcessor content1 = contentProcessor
.getContent(book, chapter.title, content1, false, useReplace) .getContent(book, "", content1, false, useReplace)
.joinToString("\n") .joinToString("\n")
.replace(chapter.title, "")
epubBook.addSection( epubBook.addSection(
chapter.title, chapter.title,
ResourceUtil.createHTMLResource(chapter.title, content1) ResourceUtil.createHTMLResource(chapter.title, content1)
@ -275,7 +273,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
val matches = AppPattern.imgPattern.toRegex().findAll(input = text) val matches = AppPattern.imgPattern.toRegex().findAll(input = text)
matches.forEach { matchResult -> matches.forEach { matchResult ->
matchResult.groupValues[1].let { matchResult.groupValues[1].let {
val src=NetworkUtils.getAbsoluteURL(chapter.url, it) val src = NetworkUtils.getAbsoluteURL(chapter.url, it)
setPic(src, book, epubBook) setPic(src, book, epubBook)
text1 = text1.replace(src, MD5Utils.md5Encode16(src) + ".jpg") text1 = text1.replace(src, MD5Utils.md5Encode16(src) + ".jpg")

Write Preview
Loading…
Cancel
Save