优化
This commit is contained in:
@@ -7,7 +7,6 @@ import io.legado.app.utils.GSON
|
|||||||
import io.legado.app.utils.fromJsonObject
|
import io.legado.app.utils.fromJsonObject
|
||||||
import io.legado.app.utils.replace
|
import io.legado.app.utils.replace
|
||||||
import io.legado.app.utils.stackTraceStr
|
import io.legado.app.utils.stackTraceStr
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
|
|
||||||
object ReplaceRuleController {
|
object ReplaceRuleController {
|
||||||
|
|
||||||
@@ -77,8 +76,7 @@ object ReplaceRuleController {
|
|||||||
returnData.setErrorMsg("替换规则不能为空")
|
returnData.setErrorMsg("替换规则不能为空")
|
||||||
}
|
}
|
||||||
val text = map["text"] as String
|
val text = map["text"] as String
|
||||||
val content = runBlocking {
|
val content = try {
|
||||||
try {
|
|
||||||
if (rule.isRegex) {
|
if (rule.isRegex) {
|
||||||
text.replace(
|
text.replace(
|
||||||
rule.pattern.toRegex(),
|
rule.pattern.toRegex(),
|
||||||
@@ -90,7 +88,6 @@ object ReplaceRuleController {
|
|||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.stackTraceStr
|
e.stackTraceStr
|
||||||
}
|
}
|
||||||
}
|
|
||||||
returnData.setData(content)
|
returnData.setData(content)
|
||||||
}
|
}
|
||||||
return returnData
|
return returnData
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import io.legado.app.model.ReadBook
|
|||||||
import io.legado.app.utils.GSON
|
import io.legado.app.utils.GSON
|
||||||
import io.legado.app.utils.MD5Utils
|
import io.legado.app.utils.MD5Utils
|
||||||
import io.legado.app.utils.fromJsonObject
|
import io.legado.app.utils.fromJsonObject
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
import kotlinx.parcelize.IgnoredOnParcel
|
import kotlinx.parcelize.IgnoredOnParcel
|
||||||
import kotlinx.parcelize.Parcelize
|
import kotlinx.parcelize.Parcelize
|
||||||
import java.nio.charset.Charset
|
import java.nio.charset.Charset
|
||||||
@@ -270,11 +269,9 @@ data class Book(
|
|||||||
fun migrateTo(newBook: Book, toc: List<BookChapter>): Book {
|
fun migrateTo(newBook: Book, toc: List<BookChapter>): Book {
|
||||||
newBook.durChapterIndex = BookHelp
|
newBook.durChapterIndex = BookHelp
|
||||||
.getDurChapter(durChapterIndex, durChapterTitle, toc, totalChapterNum)
|
.getDurChapter(durChapterIndex, durChapterTitle, toc, totalChapterNum)
|
||||||
newBook.durChapterTitle = runBlocking {
|
newBook.durChapterTitle = toc[newBook.durChapterIndex].getDisplayTitle(
|
||||||
toc[newBook.durChapterIndex].getDisplayTitle(
|
|
||||||
ContentProcessor.get(newBook.name, newBook.origin).getTitleReplaceRules()
|
ContentProcessor.get(newBook.name, newBook.origin).getTitleReplaceRules()
|
||||||
)
|
)
|
||||||
}
|
|
||||||
newBook.durChapterPos = durChapterPos
|
newBook.durChapterPos = durChapterPos
|
||||||
newBook.durChapterTime = durChapterTime
|
newBook.durChapterTime = durChapterTime
|
||||||
newBook.group = group
|
newBook.group = group
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ data class BookChapter(
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getDisplayTitle(
|
fun getDisplayTitle(
|
||||||
replaceRules: List<ReplaceRule>? = null,
|
replaceRules: List<ReplaceRule>? = null,
|
||||||
useReplace: Boolean = true,
|
useReplace: Boolean = true,
|
||||||
chineseConvert: Boolean = true,
|
chineseConvert: Boolean = true,
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ class ContentProcessor private constructor(
|
|||||||
return contentReplaceRules
|
return contentReplaceRules
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getContent(
|
fun getContent(
|
||||||
book: Book,
|
book: Book,
|
||||||
chapter: BookChapter,
|
chapter: BookChapter,
|
||||||
content: String,
|
content: String,
|
||||||
@@ -153,7 +153,7 @@ class ContentProcessor private constructor(
|
|||||||
return BookContent(sameTitleRemoved, contents)
|
return BookContent(sameTitleRemoved, contents)
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun replaceContent(content: String): String {
|
private fun replaceContent(content: String): String {
|
||||||
var mContent = content
|
var mContent = content
|
||||||
mContent = mContent.lines().joinToString("\n") { it.trim() }
|
mContent = mContent.lines().joinToString("\n") { it.trim() }
|
||||||
getContentReplaceRules().forEach { item ->
|
getContentReplaceRules().forEach { item ->
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import io.legado.app.constant.AppConst
|
|||||||
import io.legado.app.exception.RegexTimeoutException
|
import io.legado.app.exception.RegexTimeoutException
|
||||||
import io.legado.app.help.CrashHandler
|
import io.legado.app.help.CrashHandler
|
||||||
import io.legado.app.help.coroutine.Coroutine
|
import io.legado.app.help.coroutine.Coroutine
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
import kotlinx.coroutines.suspendCancellableCoroutine
|
import kotlinx.coroutines.suspendCancellableCoroutine
|
||||||
import splitties.init.appCtx
|
import splitties.init.appCtx
|
||||||
import kotlin.coroutines.resume
|
import kotlin.coroutines.resume
|
||||||
@@ -16,11 +17,12 @@ private val handler by lazy { buildMainHandler() }
|
|||||||
/**
|
/**
|
||||||
* 带有超时检测的正则替换
|
* 带有超时检测的正则替换
|
||||||
*/
|
*/
|
||||||
suspend fun CharSequence.replace(regex: Regex, replacement: String, timeout: Long): String {
|
fun CharSequence.replace(regex: Regex, replacement: String, timeout: Long): String {
|
||||||
val charSequence = this@replace
|
val charSequence = this@replace
|
||||||
val isJs = replacement.startsWith("@js:")
|
val isJs = replacement.startsWith("@js:")
|
||||||
val replacement1 = if (isJs) replacement.substring(4) else replacement
|
val replacement1 = if (isJs) replacement.substring(4) else replacement
|
||||||
return suspendCancellableCoroutine { block ->
|
return runBlocking {
|
||||||
|
suspendCancellableCoroutine { block ->
|
||||||
val coroutine = Coroutine.async {
|
val coroutine = Coroutine.async {
|
||||||
try {
|
try {
|
||||||
val pattern = regex.toPattern()
|
val pattern = regex.toPattern()
|
||||||
@@ -58,5 +60,6 @@ suspend fun CharSequence.replace(regex: Regex, replacement: String, timeout: Lon
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user