KotatsuApp/kotatsu-parsers
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ổ Truyện: Fix no value for _id in getListPage (#2259)

Browse Source 
Co-authored-by: Draken <131387159+dragonx943@users.noreply.github.com>
This commit is contained in:
Hoàng Phi Hùng
2025-09-30 19:27:46 +07:00
committed by GitHub
parent 5882a5d54d
commit a3f384e3b3
1 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/OTruyenParser.kt
View File

@@ -1,6 +1,5 @@
package org.koitharu.kotatsu.parsers.site.vi
import org.jsoup.HttpStatusException
import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.config.ConfigKey
@@ -27,7 +26,6 @@ import org.koitharu.kotatsu.parsers.util.oneOrThrowIfMany
import org.koitharu.kotatsu.parsers.util.parseJson
import org.koitharu.kotatsu.parsers.util.parseSafe
import org.koitharu.kotatsu.parsers.util.urlEncoded
import java.net.HttpURLConnection
import java.text.SimpleDateFormat
import java.util.EnumSet
import java.util.Locale
@@ -75,77 +73,74 @@ internal class OTruyenParser(context: MangaLoaderContext) :
)
}
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
val url = buildString {
append("https://")
append(domain)
when {
!filter.query.isNullOrEmpty() -> {
append("/v1/api/tim-kiem?keyword=")
append(filter.query.urlEncoded())
append("&page=")
append(page.toString())
}
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
val url = buildString {
append("https://")
append(domain)
when {
!filter.query.isNullOrEmpty() -> {
append("/v1/api/tim-kiem?keyword=")
append(filter.query.urlEncoded())
append("&page=")
append(page.toString())
}
else -> {
val tag = filter.tags.oneOrThrowIfMany()
if (tag != null) {
append("/v1/api/the-loai/")
append(tag.key)
append("?page=")
append(page)
} else if (filter.states.isNotEmpty()) {
filter.states.oneOrThrowIfMany()?.let {
append(
when (it) {
MangaState.ONGOING -> "/v1/api/danh-sach/dang-phat-hanh?page=${page}"
MangaState.FINISHED -> "/v1/api/danh-sach/hoan-thanh?page=${page}"
MangaState.UPCOMING -> "/v1/api/danh-sach/sap-ra-mat?page=${page}"
else -> "/v1/api/danh-sach/dang-phat-hanh?page=${page}" // default
}
)
}
} else {
append("/v1/api/danh-sach/truyen-moi") // SortOrder.NEWEST
append("?page=${page}")
}
}
}
}
else -> {
if (!filter.tags.isEmpty()) {
filter.tags.oneOrThrowIfMany()?.let {
append("/v1/api/the-loai/")
append(it.key)
append("?page=")
append(page)
}
} else if (filter.states.isNotEmpty()) {
filter.states.oneOrThrowIfMany()?.let {
append(
when (it) {
MangaState.FINISHED -> "/v1/api/danh-sach/hoan-thanh?page=${page}"
MangaState.UPCOMING -> "/v1/api/danh-sach/sap-ra-mat?page=${page}"
else -> "/v1/api/danh-sach/dang-phat-hanh?page=${page}" // ONGOING
}
)
}
} else {
append("/v1/api/danh-sach/truyen-moi") // SortOrder.NEWEST
append("?page=${page}")
}
}
}
}
val json = try {
webClient.httpGet(url).parseJson()
} catch (e: HttpStatusException) {
if (e.statusCode == HttpURLConnection.HTTP_INTERNAL_ERROR) {
return emptyList()
} else {
throw e
}
}
val json = try {
webClient.httpGet(url).parseJson()
} catch (_: Exception) {
return emptyList()
}
val items = json.getJSONObject("data").getJSONArray("items")
return items.mapJSON { jo ->
Manga(
id = generateUid(jo.getString("_id").hashCode().toLong()),
url = jo.getString("slug"),
publicUrl = "https://otruyen.cc/truyen-tranh/${jo.getString("slug")}",
title = jo.getString("name"),
altTitles = emptySet(),
coverUrl = "https://img.otruyenapi.com/uploads/comics/${jo.getString("thumb_url")}",
authors = emptySet(),
tags = emptySet(),
state = when (jo.getString("status")) {
"ongoing" -> MangaState.ONGOING
"coming_soon" -> MangaState.UPCOMING
"completed" -> MangaState.FINISHED
else -> null
},
contentRating = if (isNsfwSource) ContentRating.ADULT else null,
source = source,
rating = RATING_UNKNOWN,
)
}
}
val items = json.getJSONObject("data").getJSONArray("items")
return items.mapJSON { jo ->
val slug = jo.getString("slug")
Manga(
id = generateUid(slug.hashCode().toLong()),
url = slug,
publicUrl = "https://otruyen.cc/truyen-tranh/${slug}",
title = jo.getString("name"),
altTitles = emptySet(),
coverUrl = "https://img.otruyenapi.com/uploads/comics/${jo.getString("thumb_url")}",
authors = emptySet(),
tags = emptySet(),
state = when (jo.getString("status")) {
"ongoing" -> MangaState.ONGOING
"coming_soon" -> MangaState.UPCOMING
"completed" -> MangaState.FINISHED
else -> null
},
contentRating = if (isNsfwSource) ContentRating.ADULT else null,
source = source,
rating = RATING_UNKNOWN,
)
}
}
override suspend fun getDetails(manga: Manga): Manga {
val url = "https://$domain/v1/api/truyen-tranh/${manga.url}"