From 9b7e28848b7a6c89f1c6d0f507ece35583b8af07 Mon Sep 17 00:00:00 2001
From: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
Date: Tue, 4 Oct 2022 05:35:12 +0800
Subject: [PATCH] DMZJ: fix chapter name format (#13697)

* DMZJ: fix chapter name format

* make regex private
---
 src/zh/dmzj/build.gradle                             |  2 +-
 .../eu/kanade/tachiyomi/extension/zh/dmzj/Common.kt  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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(':')