diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ja/MangaMate.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ja/MangaMate.kt index 8e4ed7c3..14f5b19f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ja/MangaMate.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/ja/MangaMate.kt @@ -4,7 +4,7 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser -import java.util.* +import java.util.Locale @MangaSourceParser("MANGAMATE", "Manga Mate", "ja") internal class MangaMate(context: MangaLoaderContext) : diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pl/SkanlacjeFeniksy.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pl/SkanlacjeFeniksy.kt new file mode 100644 index 00000000..9becaf00 --- /dev/null +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/mangareader/pl/SkanlacjeFeniksy.kt @@ -0,0 +1,13 @@ +package org.koitharu.kotatsu.parsers.site.mangareader.pl + +import org.koitharu.kotatsu.parsers.MangaLoaderContext +import org.koitharu.kotatsu.parsers.MangaSourceParser +import org.koitharu.kotatsu.parsers.model.MangaSource +import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser + +@MangaSourceParser("SKANLACJEFENIKSY", "SkanlacjeFeniksy", "pl") +internal class SkanlacjeFeniksy(context: MangaLoaderContext) : + MangaReaderParser(context, MangaSource.SKANLACJEFENIKSY, "skanlacje-feniksy.pl", pageSize = 10, searchPageSize = 10) { + + override val datePattern = "d MMMM, yyyy" +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt index 9f2d6965..f4c4b357 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/site/vi/HentaiVNParser.kt @@ -2,6 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vi import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope +import okhttp3.Headers import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.koitharu.kotatsu.parsers.MangaLoaderContext @@ -9,6 +10,7 @@ import org.koitharu.kotatsu.parsers.MangaParser import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.model.* +import org.koitharu.kotatsu.parsers.network.UserAgents import org.koitharu.kotatsu.parsers.util.* import java.text.SimpleDateFormat import java.util.* @@ -21,6 +23,11 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo override val configKeyDomain: ConfigKey.Domain = ConfigKey.Domain("hentaivn.autos", "hentaivn.tv") + // hentaivn has created 2 different interfaces for mobile and desktop, and Cloudflare detects whether it's mobile or not even with a desktop user agent. + override val headers: Headers = Headers.Builder() + .add("User-Agent", UserAgents.CHROME_MOBILE) + .build() + override val sortOrders: Set = EnumSet.of( SortOrder.UPDATED, SortOrder.POPULARITY, @@ -33,23 +40,26 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo override suspend fun getDetails(manga: Manga): Manga = coroutineScope { val chapterDeferred = async { fetchChapters(manga.url) } val docs = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() - val infoEl = docs.selectFirstOrThrow("div.container") - .selectFirstOrThrow("div.page-info") + + val id = docs.location().substringAfterLast("/").substringBefore("-") + + val infoEl = webClient.httpGet("/list-info-all-mobile.php?id_anime=$id".toAbsoluteUrl(domain)).parseHtml() + + val genreUrl = Regex(""""(list-info-theloai-mobile\.php?.+)"""").find(docs.toString())?.groupValues?.get(1) + val genre = webClient.httpGet("https://$domain/$genreUrl").parseHtml().select("a.tag") + + val stateDoc = webClient.httpGet("/list-info-time-mobile.php?id_anime=$id".toAbsoluteUrl(domain)).parseHtml() manga.copy( altTitle = infoEl.infoText("Tên Khác:"), - author = infoEl.infoText("Tác giả"), - description = infoEl.selectFirst("p:contains(Nội dung:)") - ?.nextElementSibling() - ?.outerHtml(), + author = infoEl.select("p:contains(Tác giả:) a").text(), + description = infoEl.select("p:contains(Nội dung:) + p").html(), tags = tagCache.tryGet().getOrNull()?.let { tagMap -> - infoEl.selectFirst("p:contains(Thể Loại:)") - ?.select("span > a") - ?.mapNotNullToSet { - tagMap[it.text()] - } + genre.mapNotNullToSet { + tagMap[it.text()] + } }.orEmpty(), - state = infoEl.infoText("Tình Trạng:")?.let { + state = stateDoc.select("p:contains(Tình Trạng:) a").firstOrNull()?.text()?.let { when (it) { "Đã hoàn thành" -> MangaState.FINISHED "Đang tiến hành" -> MangaState.ONGOING @@ -111,13 +121,9 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo } override suspend fun getPages(chapter: MangaChapter): List { - val ids = chapter.url.removePrefix("/").split('-').take(2) - val mangaId = ids[0].toInt() - val chapterId = ids[1].toInt() - val contentUrl = "/list-loadchapter.php?id_episode=$chapterId&idchapshowz=$mangaId".toAbsoluteUrl(domain) - val docs = webClient.httpGet(contentUrl).parseHtml() - return docs.select("img").map { - val pageUrl = it.attrAsAbsoluteUrl("src") + val docs = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml() + return docs.select("#image > img").map { + val pageUrl = it.src() ?: throw Exception(it.html()) MangaPage( id = generateUid(pageUrl), url = pageUrl, @@ -166,17 +172,17 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo .selectFirstOrThrow("div.block-item") .select("ul > li.item") .map { el -> - val relativeUrl = el.selectFirstOrThrow("div.box-cover > a").attrAsRelativeUrl("href") - val descriptionsEl = el.selectFirstOrThrow("div.box-description") + val relativeUrl = el.selectFirstOrThrow("div.box-cover-2 > a").attrAsRelativeUrl("href") + val descriptionsEl = el.selectFirstOrThrow("div.box-description-2") Manga( id = generateUid(relativeUrl), - title = descriptionsEl.selectFirst("p > a")?.text().orEmpty(), + title = descriptionsEl.selectFirst("a")?.text().orEmpty(), altTitle = null, url = relativeUrl, publicUrl = relativeUrl.toAbsoluteUrl(domain), rating = RATING_UNKNOWN, isNsfw = true, - coverUrl = el.selectFirst("div.box-cover img").imageUrl(), + coverUrl = el.selectFirst("div.box-cover-2 img").imageUrl(), tags = emptySet(), state = null, author = null, @@ -217,11 +223,8 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo } private suspend fun fetchChapters(mangaUrl: String): List { - val slug = mangaUrl.substringAfterLast("/") - .removeSuffix(".html") - val name = slug.substringAfter("-") - val id = slug.substringBefore("-").toInt() - val chaptersAjax = "/list-showchapter.php?idchapshow=$id&idlinkanime=$name".toAbsoluteUrl(domain) + val id = mangaUrl.substringAfterLast("/").substringBefore('-') + val chaptersAjax = "/list-showchapter.php?idchapshow=$id".toAbsoluteUrl(domain) val chaptersEl = webClient.httpGet(chaptersAjax).parseHtml() val chapterDateFormat = SimpleDateFormat("dd/MM/yyyy") return chaptersEl.select("tbody > tr")