[DesuMe] Improvements

src/main/kotlin/org/koitharu/kotatsu/parsers/site/ru/DesuMeParser.kt

@@ -10,9 +10,7 @@ import org.koitharu.kotatsu.parsers.exception.ParseException
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.network.UserAgents
 import org.koitharu.kotatsu.parsers.util.*
-import org.koitharu.kotatsu.parsers.util.json.mapJSON
+import org.koitharu.kotatsu.parsers.util.json.*
-import org.koitharu.kotatsu.parsers.util.json.mapJSONIndexed
-import org.koitharu.kotatsu.parsers.util.json.mapJSONToSet
 import java.util.*
 
 @MangaSourceParser("DESUME", "Desu", "ru")
@@ -78,9 +76,9 @@ internal class DesuMeParser(context: MangaLoaderContext) : PagedMangaParser(cont
 				altTitle = jo.getString("name"),
 				coverUrl = cover.getString("preview"),
 				largeCoverUrl = cover.getString("original"),
-				state = when {
+				state = when (jo.getString("status")) {
-					jo.getString("status") == "ongoing" -> MangaState.ONGOING
+					"ongoing" -> MangaState.ONGOING
-					jo.getString("status") == "released" -> MangaState.FINISHED
+					"released" -> MangaState.FINISHED
 					else -> null
 				},
 				rating = jo.getDouble("score").toFloat().coerceIn(0f, 1f),
@@ -117,17 +115,24 @@ internal class DesuMeParser(context: MangaLoaderContext) : PagedMangaParser(cont
 			},
 			publicUrl = json.getString("url"),
 			description = json.getString("description"),
-			chapters = chaptersList.mapJSONIndexed { i, it ->
+			chapters = chaptersList.mapJSON { jo ->
-				val chid = it.getLong("id")
+				val chid = jo.getLong("id")
-				val volChap = "Том " + it.optString("vol", "0") + ". " + "Глава " + it.optString("ch", "0")
+				val volume = jo.getIntOrDefault("vol", 0)
-				val title = it.optString("title", "null").takeUnless { it == "null" }
+				val number = jo.getFloatOrDefault("ch", 0f)
 				MangaChapter(
 					id = generateUid(chid),
 					source = manga.source,
 					url = "$baseChapterUrl$chid",
-					uploadDate = it.getLong("date") * 1000,
+					uploadDate = jo.getLong("date") * 1000,
-					name = if (title.isNullOrEmpty()) volChap else "$volChap: $title",
+					name = jo.getStringOrNull("title") ?: buildString {
-					number = totalChapters - i,
+						append("Том ")
+						append(volume)
+						append(" Глава ")
+						append(number)
+						removeTrailingZero()
+					},
+					volume = volume,
+					number = number,
 					scanlator = null,
 					branch = null,
 				)

src/main/kotlin/org/koitharu/kotatsu/parsers/util/String.kt

@@ -245,3 +245,12 @@ inline fun <T> Appendable.appendAll(
 }
 
 fun String.isNumeric() = all { c -> c.isDigit() }
+
+internal fun StringBuilder.removeTrailingZero() {
+	if (length > 2 && get(length - 1) == '0') {
+		val dot = get(length - 2)
+		if (dot == ',' || dot == '.') {
+			delete(length - 2, length)
+		}
+	}
+}