mirror of
https://github.com/KotatsuApp/kotatsu-parsers.git
synced 2026-08-19 20:35:44 -07:00
XoxoComics: Fixes (#2229)
This commit is contained in:
Naga
@@ -92,3 +92,7 @@ local.properties
|
||||
.idea/**/runConfigurations.xml
|
||||
.idea/**/AndroidProjectSystem.xml
|
||||
.idea/caches/deviceStreaming.xml
|
||||
/.idea/copilot.data.migration.agent.xml
|
||||
/.idea/copilot.data.migration.ask.xml
|
||||
/.idea/copilot.data.migration.ask2agent.xml
|
||||
/.idea/copilot.data.migration.edit.xml
|
||||
|
||||
@@ -6,191 +6,247 @@ import kotlinx.coroutines.coroutineScope
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import org.koitharu.kotatsu.parsers.MangaLoaderContext
|
||||
import org.koitharu.kotatsu.parsers.MangaSourceParser
|
||||
import org.koitharu.kotatsu.parsers.model.*
|
||||
import org.koitharu.kotatsu.parsers.model.ContentRating
|
||||
import org.koitharu.kotatsu.parsers.model.ContentType
|
||||
import org.koitharu.kotatsu.parsers.model.Manga
|
||||
import org.koitharu.kotatsu.parsers.model.MangaChapter
|
||||
import org.koitharu.kotatsu.parsers.model.MangaListFilter
|
||||
import org.koitharu.kotatsu.parsers.model.MangaPage
|
||||
import org.koitharu.kotatsu.parsers.model.MangaParserSource
|
||||
import org.koitharu.kotatsu.parsers.model.MangaState
|
||||
import org.koitharu.kotatsu.parsers.model.MangaTag
|
||||
import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN
|
||||
import org.koitharu.kotatsu.parsers.model.SortOrder
|
||||
import org.koitharu.kotatsu.parsers.site.wpcomics.WpComicsParser
|
||||
import org.koitharu.kotatsu.parsers.util.*
|
||||
import org.koitharu.kotatsu.parsers.Broken
|
||||
import org.koitharu.kotatsu.parsers.util.attrAsRelativeUrl
|
||||
import org.koitharu.kotatsu.parsers.util.generateUid
|
||||
import org.koitharu.kotatsu.parsers.util.host
|
||||
import org.koitharu.kotatsu.parsers.util.mapChapters
|
||||
import org.koitharu.kotatsu.parsers.util.mapToSet
|
||||
import org.koitharu.kotatsu.parsers.util.oneOrThrowIfMany
|
||||
import org.koitharu.kotatsu.parsers.util.parseHtml
|
||||
import org.koitharu.kotatsu.parsers.util.parseSafe
|
||||
import org.koitharu.kotatsu.parsers.util.removeSuffix
|
||||
import org.koitharu.kotatsu.parsers.util.selectFirstOrThrow
|
||||
import org.koitharu.kotatsu.parsers.util.textOrNull
|
||||
import org.koitharu.kotatsu.parsers.util.toAbsoluteUrl
|
||||
import org.koitharu.kotatsu.parsers.util.toTitleCase
|
||||
import org.koitharu.kotatsu.parsers.util.urlEncoded
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
import java.util.EnumSet
|
||||
|
||||
@Broken
|
||||
@MangaSourceParser("XOXOCOMICS", "XoxoComics", "en", ContentType.COMICS)
|
||||
internal class XoxoComics(context: MangaLoaderContext) :
|
||||
WpComicsParser(context, MangaParserSource.XOXOCOMICS, "xoxocomic.com", 50) {
|
||||
WpComicsParser(context, MangaParserSource.XOXOCOMICS, "xoxocomic.com", 36) {
|
||||
|
||||
override val listUrl = "/comic-list"
|
||||
override val datePattern = "MM/dd/yyyy"
|
||||
override val listUrl = "/comic-list"
|
||||
override val datePattern = "MM/dd/yyyy"
|
||||
|
||||
override val availableSortOrders: Set<SortOrder> = EnumSet.of(
|
||||
SortOrder.UPDATED,
|
||||
SortOrder.NEWEST,
|
||||
SortOrder.POPULARITY,
|
||||
SortOrder.ALPHABETICAL,
|
||||
)
|
||||
override val availableSortOrders: Set<SortOrder> = EnumSet.of(
|
||||
SortOrder.UPDATED,
|
||||
SortOrder.NEWEST,
|
||||
SortOrder.POPULARITY,
|
||||
SortOrder.ALPHABETICAL,
|
||||
)
|
||||
|
||||
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
|
||||
val url = buildString {
|
||||
append("https://")
|
||||
append(domain)
|
||||
when {
|
||||
override suspend fun getListPage(page: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
|
||||
val url = buildString {
|
||||
append("https://")
|
||||
append(domain)
|
||||
when {
|
||||
!filter.query.isNullOrEmpty() -> {
|
||||
append("/search-comic?keyword=")
|
||||
append(filter.query.urlEncoded())
|
||||
append("&page=")
|
||||
append(page.toString())
|
||||
}
|
||||
|
||||
!filter.query.isNullOrEmpty() -> {
|
||||
append("/search-comic?keyword=")
|
||||
append(filter.query.urlEncoded())
|
||||
append("&page=")
|
||||
append(page.toString())
|
||||
}
|
||||
else -> {
|
||||
// Handle state filters
|
||||
val state = filter.states.oneOrThrowIfMany()
|
||||
val tag = filter.tags.oneOrThrowIfMany()
|
||||
|
||||
else -> {
|
||||
when {
|
||||
// Tag filtering (genre pages)
|
||||
tag != null -> {
|
||||
append("/")
|
||||
append(tag.key)
|
||||
append("-comic")
|
||||
when (order) {
|
||||
SortOrder.POPULARITY -> append("/popular")
|
||||
SortOrder.UPDATED -> append("/latest")
|
||||
SortOrder.NEWEST -> append("/newest")
|
||||
SortOrder.ALPHABETICAL -> append("")
|
||||
else -> append("/latest")
|
||||
}
|
||||
}
|
||||
// State filtering (ongoing/completed)
|
||||
state != null -> {
|
||||
when (state) {
|
||||
MangaState.ONGOING -> append("/ongoing-comic")
|
||||
MangaState.FINISHED -> append("/completed-comic")
|
||||
else -> append(listUrl)
|
||||
}
|
||||
when (order) {
|
||||
SortOrder.POPULARITY -> append("/popular")
|
||||
SortOrder.UPDATED -> append("/latest")
|
||||
SortOrder.NEWEST -> append("/newest")
|
||||
SortOrder.ALPHABETICAL -> append("")
|
||||
else -> append("/latest")
|
||||
}
|
||||
}
|
||||
// Default listing
|
||||
else -> {
|
||||
when (order) {
|
||||
SortOrder.UPDATED -> append("/comic-update")
|
||||
SortOrder.POPULARITY -> append("/popular-comic")
|
||||
SortOrder.NEWEST -> append("/new-comic")
|
||||
SortOrder.ALPHABETICAL -> append(listUrl)
|
||||
else -> append("/comic-update")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (filter.tags.isNotEmpty()) {
|
||||
filter.tags.oneOrThrowIfMany()?.let {
|
||||
append("/")
|
||||
append(it.key)
|
||||
}
|
||||
}
|
||||
append("?page=")
|
||||
append(page.toString())
|
||||
}
|
||||
}
|
||||
}
|
||||
val doc = webClient.httpGet(url).parseHtml()
|
||||
|
||||
filter.states.oneOrThrowIfMany()?.let {
|
||||
append(
|
||||
when (it) {
|
||||
MangaState.ONGOING -> "/ongoing"
|
||||
MangaState.FINISHED -> "/completed"
|
||||
else -> ""
|
||||
},
|
||||
)
|
||||
if (filter.tags.isEmpty()) {
|
||||
append("-comic")
|
||||
}
|
||||
}
|
||||
// Handle different page layouts: popular comics (article.item), ongoing/completed (div.item), and list pages (li.row)
|
||||
val elements = doc.select("div.items article.item, div.row div.item, li.row")
|
||||
|
||||
if (filter.states.isEmpty() && filter.tags.isEmpty()) {
|
||||
append(listUrl)
|
||||
}
|
||||
return elements.map { element ->
|
||||
// Find the main link - could be in different locations depending on page type
|
||||
val a = element.selectFirst("figure figcaption h3 a")
|
||||
?: element.selectFirst("figcaption h3 a")
|
||||
?: element.selectFirst("h3 a")
|
||||
?: element.selectFirst("a")
|
||||
?: throw IllegalStateException("Could not find main link in element")
|
||||
|
||||
when (order) {
|
||||
SortOrder.POPULARITY -> append("/popular")
|
||||
SortOrder.UPDATED -> append("/latest")
|
||||
SortOrder.NEWEST -> append("/newest")
|
||||
SortOrder.ALPHABETICAL -> append("")
|
||||
else -> append("/latest")
|
||||
}
|
||||
append("?page=")
|
||||
append(page.toString())
|
||||
}
|
||||
}
|
||||
}
|
||||
val doc = webClient.httpGet(url).parseHtml()
|
||||
val href = a.attrAsRelativeUrl("href")
|
||||
|
||||
return doc.select("div.item, #nt_listchapter nav ul li").map { div ->
|
||||
val href = div.selectFirstOrThrow("a").attrAsRelativeUrl("href")
|
||||
Manga(
|
||||
id = generateUid(href),
|
||||
url = href,
|
||||
publicUrl = href.toAbsoluteUrl(div.host ?: domain),
|
||||
coverUrl = div.selectFirst("img")?.src().orEmpty(),
|
||||
title = div.selectFirstOrThrow("h3").text().orEmpty(),
|
||||
altTitles = emptySet(),
|
||||
rating = RATING_UNKNOWN,
|
||||
tags = emptySet(),
|
||||
authors = emptySet(),
|
||||
state = null,
|
||||
source = source,
|
||||
contentRating = if (isNsfwSource) ContentRating.ADULT else null,
|
||||
)
|
||||
}
|
||||
}
|
||||
// Handle different image structures and lazy loading
|
||||
val img = element.selectFirst("img")
|
||||
val coverUrl = when {
|
||||
img?.hasAttr("data-original") == true -> img.attr("data-original")
|
||||
img?.hasAttr("data-src") == true -> img.attr("data-src")
|
||||
img?.hasAttr("src") == true -> img.attr("src")
|
||||
else -> ""
|
||||
}.takeIf { it.isNotBlank() && !it.contains("data:image") } ?: ""
|
||||
|
||||
override suspend fun getOrCreateTagMap(): ArrayMap<String, MangaTag> = mutex.withLock {
|
||||
tagCache?.let { return@withLock it }
|
||||
val doc = webClient.httpGet("https://$domain$listUrl").parseHtml()
|
||||
val list = doc.select("div.genres ul li:not(.active)").mapNotNull { li ->
|
||||
val a = li.selectFirst("a") ?: return@mapNotNull null
|
||||
val href = a.attr("href").removeSuffix('/').substringAfterLast('/')
|
||||
MangaTag(
|
||||
key = href,
|
||||
title = a.text(),
|
||||
source = source,
|
||||
)
|
||||
}
|
||||
val result = list.associateByTo(ArrayMap(list.size)) { it.title }
|
||||
tagCache = result
|
||||
result
|
||||
}
|
||||
val title = a.text().trim()
|
||||
|
||||
override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
|
||||
val fullUrl = manga.url.toAbsoluteUrl(domain)
|
||||
val doc = webClient.httpGet(fullUrl).parseHtml()
|
||||
val chaptersDeferred = async { loadChapters(fullUrl) }
|
||||
val desc = doc.selectFirstOrThrow(selectDesc).html()
|
||||
val stateDiv = doc.selectFirst(selectState)
|
||||
val state = stateDiv?.let {
|
||||
when (it.text()) {
|
||||
in ongoing -> MangaState.ONGOING
|
||||
in finished -> MangaState.FINISHED
|
||||
else -> null
|
||||
}
|
||||
}
|
||||
val author = doc.body().select(selectAut).textOrNull()
|
||||
manga.copy(
|
||||
tags = doc.body().select(selectTag).mapToSet { a ->
|
||||
MangaTag(
|
||||
key = a.attr("href").removeSuffix('/').substringAfterLast('/'),
|
||||
title = a.text().toTitleCase(),
|
||||
source = source,
|
||||
)
|
||||
},
|
||||
description = desc,
|
||||
authors = setOfNotNull(author),
|
||||
state = state,
|
||||
chapters = chaptersDeferred.await(),
|
||||
)
|
||||
}
|
||||
Manga(
|
||||
id = generateUid(href),
|
||||
url = href,
|
||||
publicUrl = href.toAbsoluteUrl(element.host ?: domain),
|
||||
coverUrl = coverUrl,
|
||||
title = title,
|
||||
altTitles = emptySet(),
|
||||
rating = RATING_UNKNOWN,
|
||||
tags = emptySet(),
|
||||
authors = emptySet(),
|
||||
state = null,
|
||||
source = source,
|
||||
contentRating = if (isNsfwSource) ContentRating.ADULT else null,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private val dateFormat = SimpleDateFormat("MM/dd/yyyy", sourceLocale)
|
||||
override suspend fun getOrCreateTagMap(): ArrayMap<String, MangaTag> = mutex.withLock {
|
||||
tagCache?.let { return@withLock it }
|
||||
val doc = webClient.httpGet("https://$domain$listUrl").parseHtml()
|
||||
val list = doc.select("div.genres ul li:not(.active)").mapNotNull { li ->
|
||||
val a = li.selectFirst("a") ?: return@mapNotNull null
|
||||
val href = a.attr("href").removeSuffix('/').substringAfterLast('/')
|
||||
MangaTag(
|
||||
key = href,
|
||||
title = a.text(),
|
||||
source = source,
|
||||
)
|
||||
}
|
||||
val result = list.associateByTo(ArrayMap(list.size)) { it.title }
|
||||
tagCache = result
|
||||
result
|
||||
}
|
||||
|
||||
private suspend fun loadChapters(baseUrl: String): List<MangaChapter> {
|
||||
val chapters = ArrayList<MangaChapter>()
|
||||
var page = 0
|
||||
while (true) {
|
||||
++page
|
||||
val doc = webClient.httpGet("$baseUrl?page=$page").parseHtml()
|
||||
doc.selectFirst("#nt_listchapter nav ul li:not(.heading)") ?: break
|
||||
chapters.addAll(
|
||||
doc.select("#nt_listchapter nav ul li:not(.heading)").mapChapters { _, li ->
|
||||
val a = li.selectFirstOrThrow("a")
|
||||
val href = a.attr("href")
|
||||
val dateText = li.selectFirst("div.col-xs-3")?.text()
|
||||
MangaChapter(
|
||||
id = generateUid(href),
|
||||
title = a.text(),
|
||||
number = 0f,
|
||||
volume = 0,
|
||||
url = href,
|
||||
scanlator = null,
|
||||
uploadDate = dateFormat.parseSafe(dateText),
|
||||
branch = null,
|
||||
source = source,
|
||||
)
|
||||
override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
|
||||
val fullUrl = manga.url.toAbsoluteUrl(domain)
|
||||
val doc = webClient.httpGet(fullUrl).parseHtml()
|
||||
val chaptersDeferred = async { loadChapters(fullUrl) }
|
||||
val desc = doc.selectFirstOrThrow(selectDesc).html()
|
||||
val stateDiv = doc.selectFirst(selectState)
|
||||
val state = stateDiv?.let {
|
||||
when (it.text()) {
|
||||
in ongoing -> MangaState.ONGOING
|
||||
in finished -> MangaState.FINISHED
|
||||
else -> null
|
||||
}
|
||||
}
|
||||
val author = doc.body().select(selectAut).textOrNull()
|
||||
manga.copy(
|
||||
tags = doc.body().select(selectTag).mapToSet { a ->
|
||||
MangaTag(
|
||||
key = a.attr("href").removeSuffix('/').substringAfterLast('/'),
|
||||
title = a.text().toTitleCase(),
|
||||
source = source,
|
||||
)
|
||||
},
|
||||
description = desc,
|
||||
authors = setOfNotNull(author),
|
||||
state = state,
|
||||
chapters = chaptersDeferred.await(),
|
||||
)
|
||||
}
|
||||
|
||||
},
|
||||
)
|
||||
}
|
||||
chapters.reverse()
|
||||
return chapters.mapIndexed { i, x -> x.copy(volume = x.volume, number = (i + 1).toFloat()) }
|
||||
}
|
||||
private val dateFormat = SimpleDateFormat("MM/dd/yyyy", sourceLocale)
|
||||
|
||||
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
|
||||
val fullUrl = chapter.url.toAbsoluteUrl(domain) + "/all"
|
||||
val doc = webClient.httpGet(fullUrl).parseHtml()
|
||||
return doc.select(selectPage).mapNotNull { url ->
|
||||
val img = url.src()?.toRelativeUrl(domain) ?: return@mapNotNull null
|
||||
val originalImage = img.replace("[", "").replace("]", "")
|
||||
MangaPage(
|
||||
id = generateUid(img),
|
||||
url = originalImage,
|
||||
preview = null,
|
||||
source = source,
|
||||
)
|
||||
}
|
||||
}
|
||||
private suspend fun loadChapters(baseUrl: String): List<MangaChapter> {
|
||||
val chapters = ArrayList<MangaChapter>()
|
||||
var page = 0
|
||||
while (true) {
|
||||
++page
|
||||
val doc = webClient.httpGet("$baseUrl?page=$page").parseHtml()
|
||||
val chapterElements = doc.select("#nt_listchapter nav ul li:not(.heading)")
|
||||
if (chapterElements.isEmpty()) break
|
||||
|
||||
chapters.addAll(
|
||||
chapterElements.mapChapters { _, li ->
|
||||
val a = li.selectFirstOrThrow("a")
|
||||
val href = a.attr("href")
|
||||
val dateText = li.selectFirst("div.col-xs-3")?.text()
|
||||
MangaChapter(
|
||||
id = generateUid(href),
|
||||
title = a.text(),
|
||||
number = 0f,
|
||||
volume = 0,
|
||||
url = href,
|
||||
scanlator = null,
|
||||
uploadDate = dateFormat.parseSafe(dateText),
|
||||
branch = null,
|
||||
source = source,
|
||||
)
|
||||
},
|
||||
)
|
||||
}
|
||||
chapters.reverse()
|
||||
return chapters.mapIndexed { i, x -> x.copy(volume = x.volume, number = (i + 1).toFloat()) }
|
||||
}
|
||||
|
||||
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
|
||||
val fullUrl = chapter.url.toAbsoluteUrl(domain) + "/all"
|
||||
val doc = webClient.httpGet(fullUrl).parseHtml()
|
||||
return doc.select("img[data-original]").mapNotNull { img ->
|
||||
val imgUrl = img.attr("data-original").takeIf { it.isNotBlank() } ?: return@mapNotNull null
|
||||
val originalImage = imgUrl.replace("[", "").replace("]", "")
|
||||
MangaPage(
|
||||
id = generateUid(originalImage),
|
||||
url = originalImage,
|
||||
preview = null,
|
||||
source = source,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user