[CuuTruyen] Fixes + Tweaks

* [Cứu Truyện] Fix chap scanlator

* [Cứu Truyện] Fix search with state + Tags
master
Draken 1 year ago committed by GitHub
parent a0041f3c93
commit c0d12b0c83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -76,6 +76,16 @@ internal class CuuTruyenParser(context: MangaLoaderContext) :
if (tag != null) { if (tag != null) {
append("/api/v2/tags/") append("/api/v2/tags/")
append(tag.key) append(tag.key)
} else if (filter.states.isNotEmpty()) {
filter.states.oneOrThrowIfMany()?.let {
append(
when (it) {
MangaState.ONGOING -> "/api/v2/tags/dang-tien-hanh"
MangaState.FINISHED -> "/api/v2/tags/da-hoan-thanh"
else -> "/api/v2/mangas/recently_updated" // if not (default page)
}
)
}
} else { } else {
append("/api/v2/mangas") append("/api/v2/mangas")
when (order) { when (order) {
@ -143,17 +153,15 @@ internal class CuuTruyenParser(context: MangaLoaderContext) :
) )
}.orEmpty() }.orEmpty()
// Testing: Add custom manga status using available tags
val state = when { val state = when {
tags.any { it.key == "da-hoan-thanh" } -> MangaState.FINISHED tags.any { it.key == "da-hoan-thanh" } -> MangaState.FINISHED
tags.any { it.key == "dang-tien-hanh" } -> MangaState.ONGOING else -> MangaState.ONGOING // Mostly ONGOING but not marked by site owner
else -> null
} }
// Remove old manga status from "tags"
val newTags = tags.filter { it.key != "da-hoan-thanh" && it.key != "dang-tien-hanh" }.toSet() val newTags = tags.filter { it.key != "da-hoan-thanh" && it.key != "dang-tien-hanh" }.toSet()
val author = json.optJSONObject("author")?.getStringOrNull("name")?.substringBefore(',')?.nullIfEmpty() val author = json.optJSONObject("author")?.getStringOrNull("name")?.substringBefore(',')?.nullIfEmpty()
val title = json.getStringOrNull("name") ?: manga.title val title = json.getStringOrNull("name") ?: manga.title
val team = json.optJSONObject("team")?.getStringOrNull("name")
manga.copy( manga.copy(
title = title, title = title,
@ -176,7 +184,7 @@ internal class CuuTruyenParser(context: MangaLoaderContext) :
number = number, number = number,
volume = 0, volume = 0,
url = "/api/v2/chapters/$chapterId", url = "/api/v2/chapters/$chapterId",
scanlator = jo.optString("group_name"), scanlator = team,
uploadDate = chapterDateFormat.tryParse(jo.getStringOrNull("created_at")), uploadDate = chapterDateFormat.tryParse(jo.getStringOrNull("created_at")),
branch = null, branch = null,
source = source, source = source,
@ -261,7 +269,6 @@ internal class CuuTruyenParser(context: MangaLoaderContext) :
MangaTag("Gyaru", "gyaru", source), MangaTag("Gyaru", "gyaru", source),
MangaTag("4-Koma", "4-koma", source), MangaTag("4-Koma", "4-koma", source),
MangaTag("Manga", "manga", source), MangaTag("Manga", "manga", source),
MangaTag("Đang tiến hành", "dang-tien-hanh", source),
MangaTag("Thể thao", "the-thao", source), MangaTag("Thể thao", "the-thao", source),
MangaTag("Hài hước", "hai-huoc", source), MangaTag("Hài hước", "hai-huoc", source),
MangaTag("Shounen", "shounen", source), MangaTag("Shounen", "shounen", source),
@ -280,7 +287,6 @@ internal class CuuTruyenParser(context: MangaLoaderContext) :
MangaTag("Phiêu lưu", "phieu-luu", source), MangaTag("Phiêu lưu", "phieu-luu", source),
MangaTag("Hậu tận thế", "hau-tan-the", source), MangaTag("Hậu tận thế", "hau-tan-the", source),
MangaTag("Hành động", "hanh-dong", source), MangaTag("Hành động", "hanh-dong", source),
MangaTag("Đã hoàn thành", "da-hoan-thanh", source),
MangaTag("Sinh tồn", "sinh-ton", source), MangaTag("Sinh tồn", "sinh-ton", source),
MangaTag("Du hành thời gian", "du-hanh-thoi-gian", source), MangaTag("Du hành thời gian", "du-hanh-thoi-gian", source),
MangaTag("Khoa học", "khoa-hoc", source), MangaTag("Khoa học", "khoa-hoc", source),

Loading…
Cancel
Save