From 3d4693ea9a59619d0b2daa31da967fe6ccc579db Mon Sep 17 00:00:00 2001 From: Administrator <1760316362@qq.com> Date: Fri, 19 Jul 2019 18:29:18 +0800 Subject: [PATCH] update --- .../main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt | 3 +-- app/src/main/java/io/legado/app/utils/StringExtensions.kt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt index 7146ae915..4b30e0451 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt @@ -462,8 +462,7 @@ class AnalyzeRule(private var book: BaseBook? = null) { } //分离正则表达式 val ruleStrS = - rule.trim { it <= ' ' }.split("##".toRegex()).dropLastWhile { it.isEmpty() } - .toTypedArray() + rule.trim { it <= ' ' }.splitNotBlank("##") rule = ruleStrS[0] if (ruleStrS.size > 1) { replaceRegex = ruleStrS[1] diff --git a/app/src/main/java/io/legado/app/utils/StringExtensions.kt b/app/src/main/java/io/legado/app/utils/StringExtensions.kt index c90c8eba9..580d8a10f 100644 --- a/app/src/main/java/io/legado/app/utils/StringExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/StringExtensions.kt @@ -27,8 +27,8 @@ fun String.splitNotBlank(delimiter: String): Array = run { this.split(delimiter).map { it.trim() }.filterNot { it.isBlank() }.toTypedArray() } -fun String.splitNotBlank(regex: Regex): Array = run { - this.split(regex).map { it.trim() }.filterNot { it.isBlank() }.toTypedArray() +fun String.splitNotBlank(regex: Regex, limit: Int = 0): Array = run { + this.split(regex, limit).map { it.trim() }.filterNot { it.isBlank() }.toTypedArray() } fun String.startWithIgnoreCase(start: String): Boolean {