From 1d0466670bfb7dc638c26be6f2c4ab57033bfeb6 Mon Sep 17 00:00:00 2001 From: Vetle Ledaal Date: Mon, 3 Oct 2022 13:47:55 +0200 Subject: [PATCH] Mihentai: remove custom page list parsing (#13678) The URL modifications doesn't work after site changes, the default behavior works fine. --- .../mangathemesia/mihentai/src/Mihentai.kt | 36 ------------------- .../mangathemesia/MangaThemesiaGenerator.kt | 2 +- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/multisrc/overrides/mangathemesia/mihentai/src/Mihentai.kt b/multisrc/overrides/mangathemesia/mihentai/src/Mihentai.kt index e16f1253e..d6900620a 100644 --- a/multisrc/overrides/mangathemesia/mihentai/src/Mihentai.kt +++ b/multisrc/overrides/mangathemesia/mihentai/src/Mihentai.kt @@ -2,44 +2,8 @@ package eu.kanade.tachiyomi.extension.all.mihentai import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia import eu.kanade.tachiyomi.source.model.FilterList -import eu.kanade.tachiyomi.source.model.Page -import kotlinx.serialization.json.jsonArray -import kotlinx.serialization.json.jsonPrimitive -import okhttp3.HttpUrl.Companion.toHttpUrl -import org.jsoup.nodes.Document -import java.lang.IllegalArgumentException class Mihentai : MangaThemesia("Mihentai", "https://mihentai.com", "all") { - override fun pageListParse(document: Document): List { - val htmlPages = document.select(pageSelector) - .filterNot { it.attr("abs:src").isNullOrEmpty() } - .mapIndexed { i, img -> - val pageUrl = img.attr("abs:src").substringAfter(baseUrl).prependIndent(baseUrl) - Page(i, "", pageUrl) - } - .toMutableList() - - countViews(document) - - if (htmlPages.isNotEmpty()) { return htmlPages } - - val docString = document.toString() - val imageListJson = JSON_IMAGE_LIST_REGEX.find(docString)?.destructured?.toList()?.get(0).orEmpty() - val imageList = try { - json.parseToJsonElement(imageListJson).jsonArray - } catch (_: IllegalArgumentException) { - emptyList() - } - val baseResolver = baseUrl.toHttpUrl() - - val scriptPages = imageList.mapIndexed { i, jsonEl -> - val imageUrl = jsonEl.jsonPrimitive.content - Page(i, "", baseResolver.resolve(imageUrl).toString()) - } - - return scriptPages - } - private class StatusFilter : SelectFilter( "Status", arrayOf( diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt index 5e71ce397..45d919169 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt @@ -75,7 +75,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Martial Manga", "https://martialmanga.com", "es"), SingleLang("MasterKomik", "https://masterkomik.com", "id", overrideVersionCode = 1), SingleLang("MELOKOMIK", "https://melokomik.xyz", "id"), - SingleLang("Mihentai", "https://mihentai.com", "all", isNsfw = true, overrideVersionCode = 1), + SingleLang("Mihentai", "https://mihentai.com", "all", isNsfw = true, overrideVersionCode = 2), SingleLang("Mode Scanlator", "https://modescanlator.com", "pt-BR", overrideVersionCode = 8), SingleLang("Nekomik", "https://nekomik.com", "id"), SingleLang("Ngomik", "https://ngomik.net", "id", overrideVersionCode = 1),