diff --git a/src/zh/dmzj/build.gradle b/src/zh/dmzj/build.gradle index d771227d7..dc1595fec 100644 --- a/src/zh/dmzj/build.gradle +++ b/src/zh/dmzj/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'DMZJ' pkgNameSuffix = 'zh.dmzj' extClass = '.Dmzj' - extVersionCode = 32 + extVersionCode = 33 } apply from: "$rootDir/common.gradle" diff --git a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Common.kt b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Common.kt index acfa8d579..912384a1d 100644 --- a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Common.kt +++ b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Common.kt @@ -30,13 +30,13 @@ fun parseStatus(status: String): Int = when (status) { else -> SManga.UNKNOWN } +private val chapterNameRegex = Regex("""(?:连载版?)?(\d[.\d]*)([话卷])?""") + fun String.formatChapterName(): String { - val replaced = removePrefix("连载") - if (!replaced[0].isDigit()) return replaced - return when (replaced.last()) { - '话', '卷' -> "第$replaced" - else -> replaced - } + val match = chapterNameRegex.matchEntire(this) ?: return this + val (number, optionalType) = match.destructured + val type = optionalType.ifEmpty { "话" } + return "第$number$type" } fun String.toHttps() = "https:" + substringAfter(':')