[Desu] Fixes
This commit is contained in:
@@ -18,182 +18,189 @@ import java.util.*
|
||||
|
||||
@MangaSourceParser("DESUME", "Desu", "ru")
|
||||
internal class DesuMeParser(context: MangaLoaderContext) :
|
||||
PagedMangaParser(context, MangaParserSource.DESUME, 20) {
|
||||
PagedMangaParser(context, MangaParserSource.DESUME, 20) {
|
||||
|
||||
override val configKeyDomain = ConfigKey.Domain("desu.city", "desu.work", "desu.store", "desu.me", "desu.win")
|
||||
override val configKeyDomain = ConfigKey.Domain(
|
||||
"x.desu.city",
|
||||
"desu.city",
|
||||
"desu.work",
|
||||
"desu.store",
|
||||
"desu.me",
|
||||
"desu.win",
|
||||
)
|
||||
|
||||
override val availableSortOrders: Set<SortOrder> = EnumSet.of(
|
||||
SortOrder.UPDATED,
|
||||
SortOrder.POPULARITY,
|
||||
SortOrder.NEWEST,
|
||||
SortOrder.ALPHABETICAL,
|
||||
)
|
||||
override val availableSortOrders: Set<SortOrder> = EnumSet.of(
|
||||
SortOrder.UPDATED,
|
||||
SortOrder.POPULARITY,
|
||||
SortOrder.NEWEST,
|
||||
SortOrder.ALPHABETICAL,
|
||||
)
|
||||
|
||||
override val filterCapabilities: MangaListFilterCapabilities
|
||||
get() = MangaListFilterCapabilities(
|
||||
isMultipleTagsSupported = true,
|
||||
isSearchSupported = true,
|
||||
isSearchWithFiltersSupported = true,
|
||||
)
|
||||
override val filterCapabilities: MangaListFilterCapabilities
|
||||
get() = MangaListFilterCapabilities(
|
||||
isMultipleTagsSupported = true,
|
||||
isSearchSupported = true,
|
||||
isSearchWithFiltersSupported = true,
|
||||
)
|
||||
|
||||
override suspend fun getFilterOptions() = MangaListFilterOptions(
|
||||
availableTags = tagsCache.get().values.toSet(),
|
||||
)
|
||||
override suspend fun getFilterOptions() = MangaListFilterOptions(
|
||||
availableTags = tagsCache.get().values.toSet(),
|
||||
)
|
||||
|
||||
override fun getRequestHeaders(): Headers = Headers.Builder()
|
||||
.add("User-Agent", UserAgents.KOTATSU)
|
||||
.build()
|
||||
override fun getRequestHeaders(): Headers = Headers.Builder()
|
||||
.add("User-Agent", UserAgents.KOTATSU)
|
||||
.build()
|
||||
|
||||
private val tagsCache = suspendLazy(initializer = ::fetchTags)
|
||||
private val tagsCache = suspendLazy(initializer = ::fetchTags)
|
||||
|
||||
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
|
||||
if (!filter.query.isNullOrEmpty() && page != searchPaginator.firstPage) {
|
||||
return emptyList()
|
||||
}
|
||||
val domain = domain
|
||||
val url = buildString {
|
||||
append("https://")
|
||||
append(domain)
|
||||
append("/manga/api/?limit=20&order=")
|
||||
append(getSortKey(order))
|
||||
append("&page=")
|
||||
append(page)
|
||||
if (filter.tags.isNotEmpty()) {
|
||||
append("&genres=")
|
||||
filter.tags.joinTo(this, ",") { it.key }
|
||||
}
|
||||
if (!filter.query.isNullOrEmpty()) {
|
||||
append("&search=")
|
||||
append(filter.query)
|
||||
}
|
||||
}
|
||||
val json = webClient.httpGet(url).parseJson().getJSONArray("response")
|
||||
?: throw ParseException("Invalid response", url)
|
||||
val total = json.length()
|
||||
val list = ArrayList<Manga>(total)
|
||||
val tagsMap = tagsCache.getOrNull()
|
||||
for (i in 0 until total) {
|
||||
val jo = json.getJSONObject(i)
|
||||
val cover = jo.getJSONObject("image")
|
||||
val id = jo.getLong("id")
|
||||
val genres = jo.getString("genres").split(',')
|
||||
list += Manga(
|
||||
url = "/manga/api/$id",
|
||||
publicUrl = jo.getString("url"),
|
||||
source = MangaParserSource.DESUME,
|
||||
title = jo.getString("russian"),
|
||||
altTitles = setOf(jo.getString("name")),
|
||||
coverUrl = cover.getString("preview"),
|
||||
largeCoverUrl = cover.getString("original"),
|
||||
state = when (jo.getString("status")) {
|
||||
"ongoing" -> MangaState.ONGOING
|
||||
"released" -> MangaState.FINISHED
|
||||
else -> null
|
||||
},
|
||||
rating = jo.getDouble("score").toFloat().coerceIn(0f, 1f),
|
||||
id = generateUid(id),
|
||||
contentRating = null,
|
||||
tags = if (!tagsMap.isNullOrEmpty()) {
|
||||
genres.mapNotNullToSet { g ->
|
||||
tagsMap[g.trim().toTitleCase()]
|
||||
}
|
||||
} else {
|
||||
emptySet()
|
||||
},
|
||||
authors = emptySet(),
|
||||
description = jo.getString("description"),
|
||||
)
|
||||
}
|
||||
return list
|
||||
}
|
||||
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
|
||||
if (!filter.query.isNullOrEmpty() && page != searchPaginator.firstPage) {
|
||||
return emptyList()
|
||||
}
|
||||
val domain = domain
|
||||
val url = buildString {
|
||||
append("https://")
|
||||
append(domain)
|
||||
append("/manga/api/?limit=20&order=")
|
||||
append(getSortKey(order))
|
||||
append("&page=")
|
||||
append(page)
|
||||
if (filter.tags.isNotEmpty()) {
|
||||
append("&genres=")
|
||||
filter.tags.joinTo(this, ",") { it.key }
|
||||
}
|
||||
if (!filter.query.isNullOrEmpty()) {
|
||||
append("&search=")
|
||||
append(filter.query)
|
||||
}
|
||||
}
|
||||
val json = webClient.httpGet(url).parseJson().getJSONArray("response")
|
||||
?: throw ParseException("Invalid response", url)
|
||||
val total = json.length()
|
||||
val list = ArrayList<Manga>(total)
|
||||
val tagsMap = tagsCache.getOrNull()
|
||||
for (i in 0 until total) {
|
||||
val jo = json.getJSONObject(i)
|
||||
val cover = jo.getJSONObject("image")
|
||||
val id = jo.getLong("id")
|
||||
val genres = jo.getString("genres").split(',')
|
||||
list += Manga(
|
||||
url = "/manga/api/$id",
|
||||
publicUrl = jo.getString("url"),
|
||||
source = MangaParserSource.DESUME,
|
||||
title = jo.getString("russian"),
|
||||
altTitles = setOf(jo.getString("name")),
|
||||
coverUrl = cover.getString("preview"),
|
||||
largeCoverUrl = cover.getString("original"),
|
||||
state = when (jo.getString("status")) {
|
||||
"ongoing" -> MangaState.ONGOING
|
||||
"released" -> MangaState.FINISHED
|
||||
else -> null
|
||||
},
|
||||
rating = jo.getDouble("score").toFloat().coerceIn(0f, 1f),
|
||||
id = generateUid(id),
|
||||
contentRating = null,
|
||||
tags = if (!tagsMap.isNullOrEmpty()) {
|
||||
genres.mapNotNullToSet { g ->
|
||||
tagsMap[g.trim().toTitleCase()]
|
||||
}
|
||||
} else {
|
||||
emptySet()
|
||||
},
|
||||
authors = emptySet(),
|
||||
description = jo.getString("description"),
|
||||
)
|
||||
}
|
||||
return list
|
||||
}
|
||||
|
||||
override suspend fun getDetails(manga: Manga): Manga {
|
||||
val url = manga.url.toAbsoluteUrl(domain)
|
||||
val json = webClient.httpGet(url).parseJson().getJSONObject("response")
|
||||
?: throw ParseException("Invalid response", url)
|
||||
val baseChapterUrl = manga.url + "/chapter/"
|
||||
val chaptersList = json.getJSONObject("chapters").getJSONArray("list")
|
||||
return manga.copy(
|
||||
tags = json.getJSONArray("genres").mapJSONToSet {
|
||||
MangaTag(
|
||||
key = it.getString("text"),
|
||||
title = it.getString("russian").toTitleCase(),
|
||||
source = manga.source,
|
||||
)
|
||||
},
|
||||
publicUrl = json.getString("url"),
|
||||
description = json.getString("description"),
|
||||
chapters = chaptersList.mapJSON { jo ->
|
||||
val chid = jo.getLong("id")
|
||||
val volume = jo.getIntOrDefault("vol", 0)
|
||||
val number = jo.getFloatOrDefault("ch", 0f)
|
||||
MangaChapter(
|
||||
id = generateUid(chid),
|
||||
source = manga.source,
|
||||
url = "$baseChapterUrl$chid",
|
||||
uploadDate = jo.getLong("date") * 1000,
|
||||
title = jo.getStringOrNull("title"),
|
||||
volume = volume,
|
||||
number = number,
|
||||
scanlator = null,
|
||||
branch = null,
|
||||
)
|
||||
}.reversed(),
|
||||
)
|
||||
}
|
||||
override suspend fun getDetails(manga: Manga): Manga {
|
||||
val url = manga.url.toAbsoluteUrl(domain)
|
||||
val json = webClient.httpGet(url).parseJson().getJSONObject("response")
|
||||
?: throw ParseException("Invalid response", url)
|
||||
val baseChapterUrl = manga.url + "/chapter/"
|
||||
val chaptersList = json.getJSONObject("chapters").getJSONArray("list")
|
||||
return manga.copy(
|
||||
tags = json.getJSONArray("genres").mapJSONToSet {
|
||||
MangaTag(
|
||||
key = it.getString("text"),
|
||||
title = it.getString("russian").toTitleCase(),
|
||||
source = manga.source,
|
||||
)
|
||||
},
|
||||
publicUrl = json.getString("url"),
|
||||
description = json.getString("description"),
|
||||
chapters = chaptersList.mapJSON { jo ->
|
||||
val chid = jo.getLong("id")
|
||||
val volume = jo.getIntOrDefault("vol", 0)
|
||||
val number = jo.getFloatOrDefault("ch", 0f)
|
||||
MangaChapter(
|
||||
id = generateUid(chid),
|
||||
source = manga.source,
|
||||
url = "$baseChapterUrl$chid",
|
||||
uploadDate = jo.getLong("date") * 1000,
|
||||
title = jo.getStringOrNull("title"),
|
||||
volume = volume,
|
||||
number = number,
|
||||
scanlator = null,
|
||||
branch = null,
|
||||
)
|
||||
}.reversed(),
|
||||
)
|
||||
}
|
||||
|
||||
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
|
||||
val fullUrl = chapter.url.toAbsoluteUrl(domain)
|
||||
val json = webClient.httpGet(fullUrl)
|
||||
.parseJson()
|
||||
.getJSONObject("response") ?: throw ParseException("Invalid response", fullUrl)
|
||||
return json.getJSONObject("pages").getJSONArray("list").mapJSON { jo ->
|
||||
MangaPage(
|
||||
id = generateUid(jo.getLong("id")),
|
||||
preview = null,
|
||||
source = chapter.source,
|
||||
url = jo.getString("img"),
|
||||
)
|
||||
}
|
||||
}
|
||||
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
|
||||
val fullUrl = chapter.url.toAbsoluteUrl(domain)
|
||||
val json = webClient.httpGet(fullUrl)
|
||||
.parseJson()
|
||||
.getJSONObject("response") ?: throw ParseException("Invalid response", fullUrl)
|
||||
return json.getJSONObject("pages").getJSONArray("list").mapJSON { jo ->
|
||||
MangaPage(
|
||||
id = generateUid(jo.getLong("id")),
|
||||
preview = null,
|
||||
source = chapter.source,
|
||||
url = jo.getString("img"),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun resolveLink(resolver: LinkResolver, link: HttpUrl): Manga? {
|
||||
val doc = webClient.httpGet(link).parseHtml()
|
||||
val mangaId = doc.getElementsByAttribute("data-manga_id").firstNotNullOfOrNull { element ->
|
||||
element.attrOrNull("data-manga_id")
|
||||
} ?: return null
|
||||
val title = doc.metaValue("headline") ?: return null
|
||||
return resolver.resolveManga(this, id = generateUid(mangaId), url = "/manga/api/$mangaId", title = title)
|
||||
}
|
||||
override suspend fun resolveLink(resolver: LinkResolver, link: HttpUrl): Manga? {
|
||||
val doc = webClient.httpGet(link).parseHtml()
|
||||
val mangaId = doc.getElementsByAttribute("data-manga_id").firstNotNullOfOrNull { element ->
|
||||
element.attrOrNull("data-manga_id")
|
||||
} ?: return null
|
||||
val title = doc.metaValue("headline") ?: return null
|
||||
return resolver.resolveManga(this, id = generateUid(mangaId), url = "/manga/api/$mangaId", title = title)
|
||||
}
|
||||
|
||||
private fun getSortKey(sortOrder: SortOrder) =
|
||||
when (sortOrder) {
|
||||
SortOrder.ALPHABETICAL -> "name"
|
||||
SortOrder.POPULARITY -> "popular"
|
||||
SortOrder.UPDATED -> "updated"
|
||||
SortOrder.NEWEST -> "id"
|
||||
else -> "updated"
|
||||
}
|
||||
private fun getSortKey(sortOrder: SortOrder) =
|
||||
when (sortOrder) {
|
||||
SortOrder.ALPHABETICAL -> "name"
|
||||
SortOrder.POPULARITY -> "popular"
|
||||
SortOrder.UPDATED -> "updated"
|
||||
SortOrder.NEWEST -> "id"
|
||||
else -> "updated"
|
||||
}
|
||||
|
||||
private suspend fun fetchTags(): Map<String, MangaTag> {
|
||||
val doc = webClient.httpGet("https://$domain/manga/").parseHtml()
|
||||
val root = doc.body().requireElementById("animeFilter")
|
||||
.selectFirstOrThrow(".catalog-genres")
|
||||
val li = root.select("li")
|
||||
val result = ArrayMap<String, MangaTag>(li.size)
|
||||
li.forEach {
|
||||
val input = it.selectFirstOrThrow("input")
|
||||
val tag = MangaTag(
|
||||
source = source,
|
||||
key = input.attr("data-genre-slug").ifEmpty {
|
||||
it.parseFailed("data-genre-slug is empty")
|
||||
},
|
||||
title = input.attr("data-genre-name").toTitleCase().ifEmpty {
|
||||
it.parseFailed("data-genre-name is empty")
|
||||
},
|
||||
)
|
||||
result[tag.title] = tag
|
||||
}
|
||||
return result
|
||||
}
|
||||
private suspend fun fetchTags(): Map<String, MangaTag> {
|
||||
val doc = webClient.httpGet("https://$domain/manga/").parseHtml()
|
||||
val root = doc.body().requireElementById("animeFilter")
|
||||
.selectFirstOrThrow(".catalog-genres")
|
||||
val li = root.select("li")
|
||||
val result = ArrayMap<String, MangaTag>(li.size)
|
||||
for (it in li) {
|
||||
val input = it.selectFirst("input") ?: continue
|
||||
val tag = MangaTag(
|
||||
source = source,
|
||||
key = input.attr("data-genre-slug").ifEmpty {
|
||||
it.parseFailed("data-genre-slug is empty")
|
||||
},
|
||||
title = input.attr("data-genre-name").toTitleCase().ifEmpty {
|
||||
it.parseFailed("data-genre-name is empty")
|
||||
},
|
||||
)
|
||||
result[tag.title] = tag
|
||||
}
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user