pull/1303/head
gedoor 4 years ago
parent 9ea725b2ca
commit b6c5a3ab8d
  1. 11
      app/src/main/java/io/legado/app/help/ContentProcessor.kt
  2. 17
      app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt
  3. 4
      app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt

@ -55,12 +55,13 @@ class ContentProcessor private constructor(
book: Book, book: Book,
title: String, //已经经过简繁转换 title: String, //已经经过简繁转换
content: String, content: String,
isRead: Boolean = true,
includeTitle: Boolean = true, includeTitle: Boolean = true,
useReplace: Boolean = book.getUseReplaceRule() useReplace: Boolean = true,
chineseConvert: Boolean = true,
reSegment: Boolean = true
): List<String> { ): List<String> {
var content1 = content var content1 = content
if (useReplace) { if (useReplace && book.getUseReplaceRule()) {
getReplaceRules().forEach { item -> getReplaceRules().forEach { item ->
if (item.pattern.isNotEmpty()) { if (item.pattern.isNotEmpty()) {
try { try {
@ -75,10 +76,10 @@ class ContentProcessor private constructor(
} }
} }
} }
if (isRead) { if (reSegment && book.getReSegment()) {
if (book.getReSegment()) {
content1 = ContentHelp.reSegment(content1, title) content1 = ContentHelp.reSegment(content1, title)
} }
if (chineseConvert) {
try { try {
when (AppConfig.chineseConverterType) { when (AppConfig.chineseConverterType) {
1 -> content1 = ChineseUtils.t2s(content1) 1 -> content1 = ChineseUtils.t2s(content1)

@ -144,9 +144,10 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
book, book,
chapter.title.replace("\\r?\\n".toRegex(), " "), chapter.title.replace("\\r?\\n".toRegex(), " "),
content ?: "null", content ?: "null",
false, includeTitle = !AppConfig.exportNoChapterName,
!AppConfig.exportNoChapterName, useReplace = useReplace,
useReplace chineseConvert = false,
reSegment = false
).joinToString("\n") ).joinToString("\n")
append.invoke("\n\n$content1") append.invoke("\n\n$content1")
} }
@ -393,7 +394,15 @@ 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, "", content1, false, useReplace) .getContent(
book,
chapter.title,
content1,
includeTitle = false,
useReplace = useReplace,
chineseConvert = false,
reSegment = false
)
.joinToString("\n") .joinToString("\n")
epubBook.addSection( epubBook.addSection(
chapter.title, chapter.title,

@ -185,7 +185,9 @@ class SearchContentActivity :
viewModel.contentProcessor!!.getContent( viewModel.contentProcessor!!.getContent(
book, book,
chapter.title, chapter.title,
bookContent bookContent,
chineseConvert = false,
reSegment = false
) )
} }
totalContents = replaceContents?.joinToString("") ?: bookContent totalContents = replaceContents?.joinToString("") ?: bookContent

Loading…
Cancel
Save