From 692e46e30963132f3b7e5583f0b4b42df3726ad9 Mon Sep 17 00:00:00 2001 From: seew3l <90949336+seew3l@users.noreply.github.com> Date: Tue, 14 Feb 2023 08:20:18 -0500 Subject: [PATCH] Update some extensions (#15350) --- src/es/lectormanga/build.gradle | 2 +- .../tachiyomi/extension/es/lectormanga/LectorManga.kt | 8 +++----- src/es/manhwasnet/build.gradle | 2 +- .../tachiyomi/extension/es/manhwasnet/ManhwasNet.kt | 5 +---- src/es/tmohentai/build.gradle | 2 +- .../tachiyomi/extension/es/tmohentai/TMOHentai.kt | 10 +++++----- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/es/lectormanga/build.gradle b/src/es/lectormanga/build.gradle index 10bfd0f0b..524f9f05b 100755 --- a/src/es/lectormanga/build.gradle +++ b/src/es/lectormanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'LectorManga' pkgNameSuffix = 'es.lectormanga' extClass = '.LectorManga' - extVersionCode = 26 + extVersionCode = 27 isNsfw = true } diff --git a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt b/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt index 29a666030..518abb59b 100755 --- a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt +++ b/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt @@ -210,15 +210,14 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() { // Regular list of chapters val chapterNames = document.select("#chapters h4.text-truncate") - val chapterNumbers = chapterNames.map { it.text().substringAfter("CapĂ­tulo").substringBefore("|").trim().toFloat() } val chapterInfos = document.select("#chapters .chapter-list") chapterNames.forEachIndexed { index, _ -> val scanlator = chapterInfos[index].select("li") if (getScanlatorPref()) { - scanlator.forEach { add(regularChapterFromElement(chapterNames[index].text(), it, chapterNumbers[index])) } + scanlator.forEach { add(regularChapterFromElement(chapterNames[index].text(), it)) } } else { - scanlator.last { add(regularChapterFromElement(chapterNames[index].text(), it, chapterNumbers[index])) } + scanlator.last { add(regularChapterFromElement(chapterNames[index].text(), it)) } } } } @@ -237,14 +236,13 @@ class LectorManga : ConfigurableSource, ParsedHttpSource() { ?: 0 } - private fun regularChapterFromElement(chapterName: String, info: Element, number: Float) = SChapter.create().apply { + private fun regularChapterFromElement(chapterName: String, info: Element) = SChapter.create().apply { url = info.select("div.row > .text-right > a").attr("href") name = chapterName scanlator = info.select("div.col-12.col-sm-12.col-md-4.text-truncate span").text() date_upload = info.select("span.badge.badge-primary.p-2").first()?.text()?.let { parseChapterDate(it) } ?: 0 - chapter_number = number } private fun parseChapterDate(date: String): Long { diff --git a/src/es/manhwasnet/build.gradle b/src/es/manhwasnet/build.gradle index 21783da0c..66c1a2154 100644 --- a/src/es/manhwasnet/build.gradle +++ b/src/es/manhwasnet/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Manhwas.net' pkgNameSuffix = 'es.manhwasnet' extClass = '.ManhwasNet' - extVersionCode = 4 + extVersionCode = 5 isNsfw = true } diff --git a/src/es/manhwasnet/src/eu/kanade/tachiyomi/extension/es/manhwasnet/ManhwasNet.kt b/src/es/manhwasnet/src/eu/kanade/tachiyomi/extension/es/manhwasnet/ManhwasNet.kt index df80c91ce..38a32f753 100644 --- a/src/es/manhwasnet/src/eu/kanade/tachiyomi/extension/es/manhwasnet/ManhwasNet.kt +++ b/src/es/manhwasnet/src/eu/kanade/tachiyomi/extension/es/manhwasnet/ManhwasNet.kt @@ -65,10 +65,7 @@ class ManhwasNet : HttpSource() { override fun pageListParse(response: Response): List { val document = response.asJsoup() return document.select("#chapter_imgs img").mapIndexed { i, img -> - var url = img.attr("src") - if (url.toString() == "/discord.jpg") { - url = "$baseUrl/discord.jpg" - } + val url = img.attr("abs:src") Page(i, imageUrl = url) } } diff --git a/src/es/tmohentai/build.gradle b/src/es/tmohentai/build.gradle index f85227927..ac39edd73 100755 --- a/src/es/tmohentai/build.gradle +++ b/src/es/tmohentai/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'TMOHentai' pkgNameSuffix = 'es.tmohentai' extClass = '.TMOHentai' - extVersionCode = 6 + extVersionCode = 7 isNsfw = true } diff --git a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt index 9bd86b4f5..493e9504f 100755 --- a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt +++ b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt @@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga +import eu.kanade.tachiyomi.source.model.UpdateStrategy import eu.kanade.tachiyomi.source.online.ParsedHttpSource import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Request @@ -43,6 +44,7 @@ class TMOHentai : ConfigurableSource, ParsedHttpSource() { title = it.attr("data-title") thumbnail_url = it.attr("data-content").substringAfter("src=\"").substringBeforeLast("\"") setUrlWithoutDomain(it.select("td.text-left > a").attr("href")) + update_strategy = UpdateStrategy.ONLY_FETCH_ONCE } } @@ -106,7 +108,7 @@ class TMOHentai : ConfigurableSource, ParsedHttpSource() { override fun pageListParse(document: Document): List = mutableListOf().apply { if (getPageMethodPref() == "cascade") { document.select("div#content-images img.content-image").forEach { - add(Page(size, "", it.attr("data-original"))) + add(Page(size, "", it.attr("abs:data-original"))) } } else { val pageList = document.select("select#select-page").first()!!.select("option").map { it.attr("value").toInt() } @@ -118,9 +120,7 @@ class TMOHentai : ConfigurableSource, ParsedHttpSource() { } } - override fun imageUrlParse(document: Document): String = document.select("div#content-images img.content-image").attr("data-original") - - override fun imageRequest(page: Page) = GET("$baseUrl${page.imageUrl!!}", headers) + override fun imageUrlParse(document: Document): String = document.select("div#content-images img.content-image").attr("abs:data-original") override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { val url = "$baseUrl/section/all?view=list".toHttpUrlOrNull()!!.newBuilder() @@ -232,7 +232,7 @@ class TMOHentai : ConfigurableSource, ParsedHttpSource() { ) /** - * Last check: 17/02/2021 + * Last check: 13/02/2023 * https://tmohentai.com/section/hentai * * Array.from(document.querySelectorAll('#advancedSearch .list-group .list-group-item'))