Update Manhwas.net (#17068)
* Update ManhwasNet * Check if sucuri exists * Remove log
This commit is contained in:
Rolando Lecca
GitHub
parent
20ffd8c649
commit
20823f4b55
|
|
@ -5,7 +5,7 @@ ext {
|
||||||
extName = 'Manhwas.net'
|
extName = 'Manhwas.net'
|
||||||
pkgNameSuffix = 'es.manhwasnet'
|
pkgNameSuffix = 'es.manhwasnet'
|
||||||
extClass = '.ManhwasNet'
|
extClass = '.ManhwasNet'
|
||||||
extVersionCode = 5
|
extVersionCode = 6
|
||||||
isNsfw = true
|
isNsfw = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,125 +1,159 @@
|
||||||
package eu.kanade.tachiyomi.extension.es.manhwasnet
|
package eu.kanade.tachiyomi.extension.es.manhwasnet
|
||||||
|
|
||||||
import eu.kanade.tachiyomi.network.GET
|
import eu.kanade.tachiyomi.network.GET
|
||||||
|
import eu.kanade.tachiyomi.source.model.Filter
|
||||||
import eu.kanade.tachiyomi.source.model.FilterList
|
import eu.kanade.tachiyomi.source.model.FilterList
|
||||||
import eu.kanade.tachiyomi.source.model.MangasPage
|
|
||||||
import eu.kanade.tachiyomi.source.model.Page
|
import eu.kanade.tachiyomi.source.model.Page
|
||||||
import eu.kanade.tachiyomi.source.model.SChapter
|
import eu.kanade.tachiyomi.source.model.SChapter
|
||||||
import eu.kanade.tachiyomi.source.model.SManga
|
import eu.kanade.tachiyomi.source.model.SManga
|
||||||
import eu.kanade.tachiyomi.source.online.HttpSource
|
import eu.kanade.tachiyomi.source.online.ParsedHttpSource
|
||||||
import eu.kanade.tachiyomi.util.asJsoup
|
|
||||||
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
import okhttp3.Response
|
import org.jsoup.nodes.Document
|
||||||
import org.jsoup.nodes.Element
|
import org.jsoup.nodes.Element
|
||||||
|
import java.util.Calendar
|
||||||
|
|
||||||
|
class ManhwasNet : ParsedHttpSource() {
|
||||||
|
|
||||||
class ManhwasNet : HttpSource() {
|
|
||||||
override val baseUrl: String = "https://manhwas.net"
|
override val baseUrl: String = "https://manhwas.net"
|
||||||
override val lang: String = "es"
|
override val lang: String = "es"
|
||||||
override val name: String = "Manhwas.net"
|
override val name: String = "Manhwas.net"
|
||||||
override val supportsLatest: Boolean = true
|
override val supportsLatest: Boolean = true
|
||||||
|
|
||||||
override fun chapterListParse(response: Response): List<SChapter> {
|
override val client = network.cloudflareClient.newBuilder()
|
||||||
val document = response.asJsoup()
|
.addInterceptor { chain ->
|
||||||
return document.select(".fa-book.d-inline-flex").map { chapterAnchor ->
|
val originalRequest = chain.request()
|
||||||
val chapterUrl = getUrlWithoutDomain(chapterAnchor.attr("href"))
|
val url = originalRequest.url.toString()
|
||||||
val chapterName = chapterUrl.substringAfterLast("-")
|
val response = chain.proceed(originalRequest)
|
||||||
val chapter = SChapter.create()
|
if (response.headers["x-sucuri-cache"].isNullOrEmpty() && url.startsWith(baseUrl) && response.headers["x-sucuri-id"] != null) {
|
||||||
chapter.chapter_number = chapterName.toFloat()
|
throw Exception("Sitio protegido - Abra en WebView para desbloquear.")
|
||||||
chapter.name = chapterName
|
}
|
||||||
chapter.url = chapterUrl
|
return@addInterceptor response
|
||||||
chapter
|
|
||||||
}
|
}
|
||||||
|
.build()
|
||||||
|
|
||||||
|
override fun headersBuilder() = super.headersBuilder()
|
||||||
|
.set("Referer", "$baseUrl/")
|
||||||
|
|
||||||
|
override fun popularMangaRequest(page: Int): Request {
|
||||||
|
val url = "$baseUrl/biblioteca".toHttpUrlOrNull()!!.newBuilder()
|
||||||
|
url.addQueryParameter("page", page.toString())
|
||||||
|
return GET(url.build().toString(), headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun imageUrlParse(response: Response): String {
|
override fun popularMangaSelector() = "ul > li > article.anime"
|
||||||
throw UnsupportedOperationException("Not used.")
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun latestUpdatesParse(response: Response): MangasPage {
|
override fun popularMangaNextPageSelector() = "ul.pagination a.page-link[rel=next]"
|
||||||
val document = response.asJsoup()
|
|
||||||
val content18 = document.select(".list-unstyled.row")[0]
|
override fun popularMangaFromElement(element: Element) = SManga.create().apply {
|
||||||
val content15 = document.select(".list-unstyled.row")[1]
|
setUrlWithoutDomain(element.selectFirst("a")!!.attr("href"))
|
||||||
val manhwas = parseManhwas(content18) + parseManhwas(content15)
|
title = element.selectFirst(".title")!!.text()
|
||||||
return MangasPage(manhwas, false)
|
thumbnail_url = element.selectFirst("img")!!.attr("abs:src")
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun latestUpdatesRequest(page: Int): Request {
|
override fun latestUpdatesRequest(page: Int): Request {
|
||||||
return GET("$baseUrl/es")
|
return GET("$baseUrl/esp")
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun mangaDetailsParse(response: Response): SManga {
|
override fun latestUpdatesSelector() = popularMangaSelector()
|
||||||
val document = response.asJsoup()
|
|
||||||
|
override fun latestUpdatesNextPageSelector() = null
|
||||||
|
|
||||||
|
override fun latestUpdatesFromElement(element: Element) = SManga.create().apply {
|
||||||
|
setUrlWithoutDomain(element.select("a").last()!!.attr("abs:href"))
|
||||||
|
title = element.selectFirst(".title")!!.text()
|
||||||
|
thumbnail_url = element.selectFirst("img")!!.attr("abs:src")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
||||||
|
val url = "$baseUrl/biblioteca".toHttpUrlOrNull()!!.newBuilder()
|
||||||
|
if (query.isNotEmpty()) {
|
||||||
|
url.addQueryParameter("buscar", query)
|
||||||
|
} else {
|
||||||
|
filters.forEach { filter ->
|
||||||
|
when (filter) {
|
||||||
|
is GenreFilter -> {
|
||||||
|
url.addQueryParameter("genero", filter.toUriPart())
|
||||||
|
}
|
||||||
|
is OrderFilter -> {
|
||||||
|
url.addQueryParameter("estado", filter.toUriPart())
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
url.addQueryParameter("page", page.toString())
|
||||||
|
return GET(url.build().toString())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun searchMangaSelector() = popularMangaSelector()
|
||||||
|
|
||||||
|
override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
|
||||||
|
|
||||||
|
override fun searchMangaFromElement(element: Element) = popularMangaFromElement(element)
|
||||||
|
|
||||||
|
override fun mangaDetailsParse(document: Document): SManga {
|
||||||
val profileManga = document.selectFirst(".anime-single")!!
|
val profileManga = document.selectFirst(".anime-single")!!
|
||||||
val manhwa = SManga.create()
|
return SManga.create().apply {
|
||||||
manhwa.title = profileManga.selectFirst(".title")!!.text()
|
title = profileManga.selectFirst(".title")!!.text()
|
||||||
manhwa.thumbnail_url = profileManga.selectFirst("img")!!.attr("src")
|
thumbnail_url = profileManga.selectFirst("img")!!.attr("abs:src")
|
||||||
manhwa.description = profileManga.selectFirst(".sinopsis")!!.text().substringAfter(manhwa.title + " ")
|
description = profileManga.selectFirst(".sinopsis")!!.text()
|
||||||
val status = profileManga.select(".anime-type-peli.text-white").text()
|
status = parseStatus(profileManga.select("span.anime-type-peli").last()!!.text())
|
||||||
manhwa.status = SManga.ONGOING
|
genre = profileManga.select("p.genres > span").joinToString { it.text() }
|
||||||
if (!status.contains("Publicándose")) manhwa.status = SManga.COMPLETED
|
}
|
||||||
|
|
||||||
return manhwa
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun pageListParse(response: Response): List<Page> {
|
override fun chapterListSelector() = "ul.episodes-list > li"
|
||||||
val document = response.asJsoup()
|
|
||||||
|
override fun chapterFromElement(element: Element) = SChapter.create().apply {
|
||||||
|
setUrlWithoutDomain(element.selectFirst("a")!!.attr("abs:href"))
|
||||||
|
name = element.selectFirst("a > div > p > span")!!.text()
|
||||||
|
date_upload = parseRelativeDate(element.selectFirst("a > div > span")!!.text())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun pageListParse(document: Document): List<Page> {
|
||||||
return document.select("#chapter_imgs img").mapIndexed { i, img ->
|
return document.select("#chapter_imgs img").mapIndexed { i, img ->
|
||||||
val url = img.attr("abs:src")
|
val url = img.attr("abs:src")
|
||||||
Page(i, imageUrl = url)
|
Page(i, imageUrl = url)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun popularMangaParse(response: Response): MangasPage {
|
override fun imageUrlParse(document: Document) = throw UnsupportedOperationException("Not used.")
|
||||||
return parseLibraryMangas(response)
|
|
||||||
|
override fun getFilterList() = FilterList(
|
||||||
|
Filter.Header("Los filtros no se pueden combinar:"),
|
||||||
|
Filter.Header("Prioridad: Texto > Géneros > Estado"),
|
||||||
|
Filter.Separator(),
|
||||||
|
GenreFilter(),
|
||||||
|
OrderFilter(),
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun parseStatus(status: String): Int = when (status) {
|
||||||
|
"Publicándose" -> SManga.ONGOING
|
||||||
|
"Finalizado" -> SManga.COMPLETED
|
||||||
|
"Cancelado" -> SManga.CANCELLED
|
||||||
|
"Pausado" -> SManga.ON_HIATUS
|
||||||
|
else -> SManga.UNKNOWN
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun popularMangaRequest(page: Int): Request {
|
private fun parseRelativeDate(date: String): Long {
|
||||||
val url = "$baseUrl/biblioteca".toHttpUrlOrNull()!!.newBuilder()
|
val number = Regex("""(\d+)""").find(date)?.value?.toIntOrNull() ?: return 0
|
||||||
if (page > 1) {
|
val cal = Calendar.getInstance()
|
||||||
url.addQueryParameter("page", page.toString())
|
|
||||||
}
|
|
||||||
return GET(url.build().toString())
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun searchMangaParse(response: Response): MangasPage {
|
return when {
|
||||||
return parseLibraryMangas(response)
|
WordSet("segundo").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
|
||||||
}
|
WordSet("minuto").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
|
||||||
|
WordSet("hora").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
|
||||||
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
|
WordSet("día").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
|
||||||
val url = "$baseUrl/biblioteca".toHttpUrlOrNull()!!.newBuilder()
|
WordSet("semana").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number * 7) }.timeInMillis
|
||||||
url.addQueryParameter("buscar", query)
|
WordSet("mes").anyWordIn(date) -> cal.apply { add(Calendar.MONTH, -number) }.timeInMillis
|
||||||
if (page > 1) {
|
WordSet("año").anyWordIn(date) -> cal.apply { add(Calendar.YEAR, -number) }.timeInMillis
|
||||||
url.addQueryParameter("page", page.toString())
|
else -> 0
|
||||||
}
|
|
||||||
return GET(url.build().toString())
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun parseLibraryMangas(response: Response): MangasPage {
|
|
||||||
val document = response.asJsoup()
|
|
||||||
val content = document.selectFirst(".animes")!!
|
|
||||||
val manhwas = parseManhwas(content)
|
|
||||||
val hasNextPage = document.selectFirst(".pagination .page-link[rel=\"next\"]") != null
|
|
||||||
return MangasPage(manhwas, hasNextPage)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun parseManhwas(element: Element): List<SManga> {
|
|
||||||
return element.select(".anime").map { anime ->
|
|
||||||
val manhwa = SManga.create()
|
|
||||||
manhwa.title = anime.selectFirst(".title")!!.text().trim()
|
|
||||||
manhwa.thumbnail_url = anime.selectFirst("img")!!.attr("src")
|
|
||||||
manhwa.url = getUrlWithoutDomain(
|
|
||||||
transformUrl(anime.select("a").attr("href")),
|
|
||||||
)
|
|
||||||
manhwa
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun transformUrl(url: String): String {
|
class WordSet(private vararg val words: String) {
|
||||||
if (!url.contains("/leer/")) return url
|
fun anyWordIn(dateString: String): Boolean = words.any { dateString.contains(it, ignoreCase = true) }
|
||||||
val name = url.substringAfter("/leer/").substringBeforeLast("-")
|
|
||||||
return "$baseUrl/manga/$name"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getUrlWithoutDomain(url: String) = url.substringAfter(baseUrl)
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,84 @@
|
||||||
|
package eu.kanade.tachiyomi.extension.es.manhwasnet
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.source.model.Filter
|
||||||
|
|
||||||
|
class GenreFilter() : UriPartFilter(
|
||||||
|
"Género",
|
||||||
|
arrayOf(
|
||||||
|
Pair("Acción", "accion"),
|
||||||
|
Pair("Aventura", "aventura"),
|
||||||
|
Pair("Comedia", "comedia"),
|
||||||
|
Pair("Recuentos de la vida", "recuentos-de-la-vida"),
|
||||||
|
Pair("Ecchi", "ecchi"),
|
||||||
|
Pair("Fantasia", "fantasia"),
|
||||||
|
Pair("Magia", "magia"),
|
||||||
|
Pair("Sobrenatural", "sobrenatural"),
|
||||||
|
Pair("Horror", "horror"),
|
||||||
|
Pair("Misterio", "misterio"),
|
||||||
|
Pair("Psicológico", "psicologico"),
|
||||||
|
Pair("Romance", "romance"),
|
||||||
|
Pair("Ciencia Ficción", "ciencia-ficcion"),
|
||||||
|
Pair("Thriller", "thriller"),
|
||||||
|
Pair("Deporte", "deporte"),
|
||||||
|
Pair("Girls Love", "girls-love"),
|
||||||
|
Pair("Boys Love", "boys-love"),
|
||||||
|
Pair("Harem", "harem"),
|
||||||
|
Pair("Mecha", "mecha"),
|
||||||
|
Pair("Supervivencia", "supervivencia"),
|
||||||
|
Pair("Reencarnación", "reencarnacion"),
|
||||||
|
Pair("Gore", "gore"),
|
||||||
|
Pair("Apocalíptico", "apocaliptico"),
|
||||||
|
Pair("Tragedia", "tragedia"),
|
||||||
|
Pair("Vida Escolar", "vida-escolar"),
|
||||||
|
Pair("Historia", "historia"),
|
||||||
|
Pair("Policiaco", "policiaco"),
|
||||||
|
Pair("Crimen", "crimen"),
|
||||||
|
Pair("Superpoderes", "superpoderes"),
|
||||||
|
Pair("Vampiros", "vampiros"),
|
||||||
|
Pair("Artes Marciales", "artes-marcialos"),
|
||||||
|
Pair("Samurái", "samurai"),
|
||||||
|
Pair("Género Bender", "genero-bender"),
|
||||||
|
Pair("Realidad Virtual", "realidad-virtual"),
|
||||||
|
Pair("Ciberpunk", "ciberpunk"),
|
||||||
|
Pair("Musica", "musica"),
|
||||||
|
Pair("Parodia", "parodia"),
|
||||||
|
Pair("Animación", "animacion"),
|
||||||
|
Pair("Demonios", "demonios"),
|
||||||
|
Pair("Familia", "familia"),
|
||||||
|
Pair("Extranjero", "extranjero"),
|
||||||
|
Pair("Niños", "ninos"),
|
||||||
|
Pair("Realidad", "realidad"),
|
||||||
|
Pair("Telenovela", "telenovela"),
|
||||||
|
Pair("Guerra", "guerra"),
|
||||||
|
Pair("Oeste", "oeste"),
|
||||||
|
Pair("Ahegao", "Ahegao"),
|
||||||
|
Pair("Anal", "Anal"),
|
||||||
|
Pair("Big Ass", "Big Ass"),
|
||||||
|
Pair("Bondage", "Bondage"),
|
||||||
|
Pair("Chantaje", "Chantaje"),
|
||||||
|
Pair("Colegiala", "Colegiala"),
|
||||||
|
Pair("Incesto", "incesto"),
|
||||||
|
Pair("Juguetes Sexuales", "Juguetes Sexuales"),
|
||||||
|
Pair("Nympho", "Nympho"),
|
||||||
|
Pair("Netorare", "Netorare"),
|
||||||
|
Pair("Cheating", " Cheating"),
|
||||||
|
Pair("Schoolgirl Uniform", "schoolgirl uniform"),
|
||||||
|
Pair("Rape", "rape"),
|
||||||
|
Pair("Lolicon", "Lolicon"),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
class OrderFilter() : UriPartFilter(
|
||||||
|
"Estado",
|
||||||
|
arrayOf(
|
||||||
|
Pair("Publicándose", "publishing"),
|
||||||
|
Pair("Finalizado", "ended"),
|
||||||
|
Pair("Cancelado", "cancelled"),
|
||||||
|
Pair("Pausado", "on_hold"),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
|
||||||
|
Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
|
||||||
|
fun toUriPart() = vals[state].second
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue