add skanlacje-feniksy and fix hentaivn

pull/229/head
devi 3 years ago
parent b900c05d9b
commit f34dd7926a

@ -4,7 +4,7 @@ import org.koitharu.kotatsu.parsers.MangaLoaderContext
import org.koitharu.kotatsu.parsers.MangaSourceParser import org.koitharu.kotatsu.parsers.MangaSourceParser
import org.koitharu.kotatsu.parsers.model.MangaSource import org.koitharu.kotatsu.parsers.model.MangaSource
import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser import org.koitharu.kotatsu.parsers.site.mangareader.MangaReaderParser
import java.util.* import java.util.Locale
@MangaSourceParser("MANGAMATE", "Manga Mate", "ja") @MangaSourceParser("MANGAMATE", "Manga Mate", "ja")
internal class MangaMate(context: MangaLoaderContext) : internal class MangaMate(context: MangaLoaderContext) :

@ -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"
}

@ -2,6 +2,7 @@ package org.koitharu.kotatsu.parsers.site.vi
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
import okhttp3.Headers
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import org.koitharu.kotatsu.parsers.MangaLoaderContext 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.MangaSourceParser
import org.koitharu.kotatsu.parsers.config.ConfigKey import org.koitharu.kotatsu.parsers.config.ConfigKey
import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.*
import org.koitharu.kotatsu.parsers.network.UserAgents
import org.koitharu.kotatsu.parsers.util.* import org.koitharu.kotatsu.parsers.util.*
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* 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") 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<SortOrder> = EnumSet.of( override val sortOrders: Set<SortOrder> = EnumSet.of(
SortOrder.UPDATED, SortOrder.UPDATED,
SortOrder.POPULARITY, SortOrder.POPULARITY,
@ -33,23 +40,26 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo
override suspend fun getDetails(manga: Manga): Manga = coroutineScope { override suspend fun getDetails(manga: Manga): Manga = coroutineScope {
val chapterDeferred = async { fetchChapters(manga.url) } val chapterDeferred = async { fetchChapters(manga.url) }
val docs = webClient.httpGet(manga.url.toAbsoluteUrl(domain)).parseHtml() 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( manga.copy(
altTitle = infoEl.infoText("Tên Khác:"), altTitle = infoEl.infoText("Tên Khác:"),
author = infoEl.infoText("Tác giả"), author = infoEl.select("p:contains(Tác giả:) a").text(),
description = infoEl.selectFirst("p:contains(Nội dung:)") description = infoEl.select("p:contains(Nội dung:) + p").html(),
?.nextElementSibling()
?.outerHtml(),
tags = tagCache.tryGet().getOrNull()?.let { tagMap -> tags = tagCache.tryGet().getOrNull()?.let { tagMap ->
infoEl.selectFirst("p:contains(Thể Loại:)") genre.mapNotNullToSet {
?.select("span > a")
?.mapNotNullToSet {
tagMap[it.text()] tagMap[it.text()]
} }
}.orEmpty(), }.orEmpty(),
state = infoEl.infoText("Tình Trạng:")?.let { state = stateDoc.select("p:contains(Tình Trạng:) a").firstOrNull()?.text()?.let {
when (it) { when (it) {
"Đã hoàn thành" -> MangaState.FINISHED "Đã hoàn thành" -> MangaState.FINISHED
"Đang tiến hành" -> MangaState.ONGOING "Đ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<MangaPage> { override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
val ids = chapter.url.removePrefix("/").split('-').take(2) val docs = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
val mangaId = ids[0].toInt() return docs.select("#image > img").map {
val chapterId = ids[1].toInt() val pageUrl = it.src() ?: throw Exception(it.html())
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")
MangaPage( MangaPage(
id = generateUid(pageUrl), id = generateUid(pageUrl),
url = pageUrl, url = pageUrl,
@ -166,17 +172,17 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo
.selectFirstOrThrow("div.block-item") .selectFirstOrThrow("div.block-item")
.select("ul > li.item") .select("ul > li.item")
.map { el -> .map { el ->
val relativeUrl = el.selectFirstOrThrow("div.box-cover > a").attrAsRelativeUrl("href") val relativeUrl = el.selectFirstOrThrow("div.box-cover-2 > a").attrAsRelativeUrl("href")
val descriptionsEl = el.selectFirstOrThrow("div.box-description") val descriptionsEl = el.selectFirstOrThrow("div.box-description-2")
Manga( Manga(
id = generateUid(relativeUrl), id = generateUid(relativeUrl),
title = descriptionsEl.selectFirst("p > a")?.text().orEmpty(), title = descriptionsEl.selectFirst("a")?.text().orEmpty(),
altTitle = null, altTitle = null,
url = relativeUrl, url = relativeUrl,
publicUrl = relativeUrl.toAbsoluteUrl(domain), publicUrl = relativeUrl.toAbsoluteUrl(domain),
rating = RATING_UNKNOWN, rating = RATING_UNKNOWN,
isNsfw = true, isNsfw = true,
coverUrl = el.selectFirst("div.box-cover img").imageUrl(), coverUrl = el.selectFirst("div.box-cover-2 img").imageUrl(),
tags = emptySet(), tags = emptySet(),
state = null, state = null,
author = null, author = null,
@ -217,11 +223,8 @@ class HentaiVNParser(context: MangaLoaderContext) : MangaParser(context, MangaSo
} }
private suspend fun fetchChapters(mangaUrl: String): List<MangaChapter> { private suspend fun fetchChapters(mangaUrl: String): List<MangaChapter> {
val slug = mangaUrl.substringAfterLast("/") val id = mangaUrl.substringAfterLast("/").substringBefore('-')
.removeSuffix(".html") val chaptersAjax = "/list-showchapter.php?idchapshow=$id".toAbsoluteUrl(domain)
val name = slug.substringAfter("-")
val id = slug.substringBefore("-").toInt()
val chaptersAjax = "/list-showchapter.php?idchapshow=$id&idlinkanime=$name".toAbsoluteUrl(domain)
val chaptersEl = webClient.httpGet(chaptersAjax).parseHtml() val chaptersEl = webClient.httpGet(chaptersAjax).parseHtml()
val chapterDateFormat = SimpleDateFormat("dd/MM/yyyy") val chapterDateFormat = SimpleDateFormat("dd/MM/yyyy")
return chaptersEl.select("tbody > tr") return chaptersEl.select("tbody > tr")

Loading…
Cancel
Save