[Mangaeden] Fix images italian version (#3464)
* Fix images Based on the english version * Update build.gradle
This commit is contained in:
parent
d12d370e51
commit
e57d4704ad
@ -5,7 +5,7 @@ ext {
|
|||||||
appName = 'Tachiyomi: Mangaeden'
|
appName = 'Tachiyomi: Mangaeden'
|
||||||
pkgNameSuffix = 'it.mangaeden'
|
pkgNameSuffix = 'it.mangaeden'
|
||||||
extClass = '.Mangaeden'
|
extClass = '.Mangaeden'
|
||||||
extVersionCode = 5
|
extVersionCode = 6
|
||||||
libVersion = '1.2'
|
libVersion = '1.2'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@ import java.text.ParseException
|
|||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Calendar
|
import java.util.Calendar
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
import okhttp3.Headers
|
||||||
import okhttp3.HttpUrl
|
import okhttp3.HttpUrl
|
||||||
import okhttp3.Request
|
import okhttp3.Request
|
||||||
import org.jsoup.nodes.Document
|
import org.jsoup.nodes.Document
|
||||||
@ -26,6 +27,11 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
|
|
||||||
override val supportsLatest = true
|
override val supportsLatest = true
|
||||||
|
|
||||||
|
// so hcaptcha won't be triggered on images
|
||||||
|
override fun headersBuilder(): Headers.Builder {
|
||||||
|
return super.headersBuilder().add("Referer", baseUrl)
|
||||||
|
}
|
||||||
|
|
||||||
override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/it/it-directory/?order=3&page=$page", headers)
|
override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/it/it-directory/?order=3&page=$page", headers)
|
||||||
|
|
||||||
override fun latestUpdatesSelector() = searchMangaSelector()
|
override fun latestUpdatesSelector() = searchMangaSelector()
|
||||||
@ -34,7 +40,7 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
|
|
||||||
override fun latestUpdatesNextPageSelector() = searchMangaNextPageSelector()
|
override fun latestUpdatesNextPageSelector() = searchMangaNextPageSelector()
|
||||||
|
|
||||||
override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/it/it-directory/?page=$page", headers)
|
override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/it/it-directory/?order=1&page=$page", headers)
|
||||||
|
|
||||||
override fun popularMangaSelector() = searchMangaSelector()
|
override fun popularMangaSelector() = searchMangaSelector()
|
||||||
|
|
||||||
@ -55,7 +61,7 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
.map { it.id.toString() }
|
.map { it.id.toString() }
|
||||||
.forEach { url.addQueryParameter("type", it) }
|
.forEach { url.addQueryParameter("type", it) }
|
||||||
is GenreList -> filter.state
|
is GenreList -> filter.state
|
||||||
.filterNot { it.isIgnored() }
|
.filter { !it.isIgnored() }
|
||||||
.forEach { genre -> url.addQueryParameter(if (genre.isIncluded()) "categoriesInc" else "categoriesExcl", genre.id) }
|
.forEach { genre -> url.addQueryParameter(if (genre.isIncluded()) "categoriesInc" else "categoriesExcl", genre.id) }
|
||||||
is TextField -> url.addQueryParameter(filter.key, filter.state)
|
is TextField -> url.addQueryParameter(filter.key, filter.state)
|
||||||
is OrderBy -> filter.state?.let {
|
is OrderBy -> filter.state?.let {
|
||||||
@ -68,13 +74,11 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
return GET(url.toString(), headers)
|
return GET(url.toString(), headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun searchMangaSelector() = "table#mangaList > tbody > tr:has(td:gt(1))"
|
override fun searchMangaSelector() = "table#mangaList tbody tr td:first-child a"
|
||||||
|
|
||||||
override fun searchMangaFromElement(element: Element) = SManga.create().apply {
|
override fun searchMangaFromElement(element: Element) = SManga.create().apply {
|
||||||
element.select("td > a").first()?.let {
|
setUrlWithoutDomain(element.attr("href"))
|
||||||
setUrlWithoutDomain(it.attr("href"))
|
title = element.text()
|
||||||
title = it.text()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun searchMangaNextPageSelector() = "a:has(span.next)"
|
override fun searchMangaNextPageSelector() = "a:has(span.next)"
|
||||||
@ -87,8 +91,7 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
genre = infos.select("a[href^=/it/it-directory/?categoriesInc]").joinToString { it.text() }
|
genre = infos.select("a[href^=/it/it-directory/?categoriesInc]").joinToString { it.text() }
|
||||||
description = document.select("h2#mangaDescription").text()
|
description = document.select("h2#mangaDescription").text()
|
||||||
status = parseStatus(infos.select("h4:containsOwn(Stato)").first()?.nextSibling().toString())
|
status = parseStatus(infos.select("h4:containsOwn(Stato)").first()?.nextSibling().toString())
|
||||||
val img = infos.select("div.mangaImage2 > img").first()?.attr("src")
|
thumbnail_url = document.select("div.mangaImage2 > img").attr("abs:src")
|
||||||
if (!img.isNullOrBlank()) thumbnail_url = img.let { "https:$it" }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun parseStatus(status: String) = when {
|
private fun parseStatus(status: String) = when {
|
||||||
@ -102,7 +105,7 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
override fun chapterFromElement(element: Element) = SChapter.create().apply {
|
override fun chapterFromElement(element: Element) = SChapter.create().apply {
|
||||||
val a = element.select("a[href^=/it/it-manga/]").first()
|
val a = element.select("a[href^=/it/it-manga/]").first()
|
||||||
|
|
||||||
setUrlWithoutDomain(a?.attr("href").orEmpty())
|
setUrlWithoutDomain(a.attr("href"))
|
||||||
name = a?.select("b")?.first()?.text().orEmpty()
|
name = a?.select("b")?.first()?.text().orEmpty()
|
||||||
date_upload = element.select("td.chapterDate").first()?.text()?.let { parseChapterDate(it.trim()) } ?: 0L
|
date_upload = element.select("td.chapterDate").first()?.text()?.let { parseChapterDate(it.trim()) } ?: 0L
|
||||||
}
|
}
|
||||||
@ -133,18 +136,18 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun pageListParse(document: Document): List<Page> = mutableListOf<Page>().apply {
|
override fun pageListParse(document: Document): List<Page> {
|
||||||
document.select("option[value^=/it/it-manga/]").forEach {
|
return document.select("select#pageSelect option").mapIndexed { i, element ->
|
||||||
add(Page(size, "$baseUrl${it.attr("value")}"))
|
Page(i, element.attr("abs:value"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun imageUrlParse(document: Document): String = document.select("a#nextA.next > img").first()?.attr("src").let { "https:$it" }
|
override fun imageUrlParse(document: Document): String = document.select("a.next img").attr("abs:src")
|
||||||
|
|
||||||
private class NamedId(name: String, val id: Int) : Filter.CheckBox(name)
|
private class NamedId(name: String, val id: Int) : Filter.CheckBox(name)
|
||||||
private class Genre(name: String, val id: String) : Filter.TriState(name)
|
private class Genre(name: String, val id: String) : Filter.TriState(name)
|
||||||
private class TextField(name: String, val key: String) : Filter.Text(name)
|
private class TextField(name: String, val key: String) : Filter.Text(name)
|
||||||
private class OrderBy : Filter.Sort("Ordina per", arrayOf("Titolo manga", "Visite", "Capitoli", "Ultimo capitolo"),
|
private class OrderBy : Filter.Sort("Order by", arrayOf("Titolo manga", "Visite", "Capitoli", "Ultimo capitolo"),
|
||||||
Selection(1, false))
|
Selection(1, false))
|
||||||
|
|
||||||
private class StatusList(statuses: List<NamedId>) : Filter.Group<NamedId>("Stato", statuses)
|
private class StatusList(statuses: List<NamedId>) : Filter.Group<NamedId>("Stato", statuses)
|
||||||
@ -175,6 +178,7 @@ class Mangaeden : ParsedHttpSource() {
|
|||||||
)
|
)
|
||||||
|
|
||||||
private fun genres() = listOf(
|
private fun genres() = listOf(
|
||||||
|
|
||||||
Genre("Avventura", "4e70ea8cc092255ef70073d3"),
|
Genre("Avventura", "4e70ea8cc092255ef70073d3"),
|
||||||
Genre("Azione", "4e70ea8cc092255ef70073c3"),
|
Genre("Azione", "4e70ea8cc092255ef70073c3"),
|
||||||
Genre("Bara", "4e70ea90c092255ef70074b7"),
|
Genre("Bara", "4e70ea90c092255ef70074b7"),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user