pull/32/head
kunfei 5 years ago
parent 32ec555ffe
commit 27a2785be4
  1. 6
      app/src/main/java/io/legado/app/data/entities/ReplaceRule.kt
  2. 13
      app/src/main/java/io/legado/app/help/BookHelp.kt
  3. 1
      app/src/main/java/io/legado/app/ui/replacerule/ReplaceEditActivity.kt

@ -15,10 +15,10 @@ import kotlinx.android.parcel.Parcelize
data class ReplaceRule( data class ReplaceRule(
@PrimaryKey(autoGenerate = true) @PrimaryKey(autoGenerate = true)
var id: Int = 0, var id: Int = 0,
var name: String? = null, var name: String = "",
var group: String? = null, var group: String? = null,
var pattern: String? = null, var pattern: String = "",
var replacement: String? = null, var replacement: String = "",
var scope: String? = null, var scope: String? = null,
var isEnabled: Boolean = true, var isEnabled: Boolean = true,
var isRegex: Boolean = true, var isRegex: Boolean = true,

@ -124,8 +124,11 @@ object BookHelp {
var bookOrigin: String? = null var bookOrigin: String? = null
var replaceRules: List<ReplaceRule> = arrayListOf() var replaceRules: List<ReplaceRule> = arrayListOf()
fun disposeContent(name: String, origin: String?, content: String, enableReplace: Boolean) fun disposeContent(
: String { name: String, origin: String?,
content: String,
enableReplace: Boolean
): String {
var c = content var c = content
synchronized(this) { synchronized(this) {
if (enableReplace && (bookName != name || bookOrigin != origin)) { if (enableReplace && (bookName != name || bookOrigin != origin)) {
@ -137,12 +140,12 @@ object BookHelp {
} }
} }
for (item in replaceRules) { for (item in replaceRules) {
item.pattern?.let { item.pattern.let {
if (it.isNotEmpty()) { if (it.isNotEmpty()) {
c = if (item.isRegex) { c = if (item.isRegex) {
c.replace(it.toRegex(), item.replacement ?: "") c.replace(it.toRegex(), item.replacement)
} else { } else {
c.replace(it, item.replacement ?: "") c.replace(it, item.replacement)
} }
} }
} }

@ -29,4 +29,5 @@ class ReplaceEditActivity :
return super.onCompatOptionsItemSelected(item) return super.onCompatOptionsItemSelected(item)
} }
} }

Loading…
Cancel
Save