diff --git a/src/pt/mangahost/build.gradle b/src/pt/mangahost/build.gradle index 51595b6ec..cedaddbab 100644 --- a/src/pt/mangahost/build.gradle +++ b/src/pt/mangahost/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'MangaHost' pkgNameSuffix = 'pt.mangahost' extClass = '.MangaHost' - extVersionCode = 10 + extVersionCode = 11 libVersion = '1.2' } diff --git a/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt b/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt index 8f883391d..493bbd522 100644 --- a/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt +++ b/src/pt/mangahost/src/eu/kanade/tachiyomi/extension/pt/mangahost/MangaHost.kt @@ -13,7 +13,6 @@ import okhttp3.Headers import okhttp3.HttpUrl import okhttp3.OkHttpClient import okhttp3.Request -import org.jsoup.Jsoup import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.jsoup.select.Elements @@ -37,12 +36,10 @@ class MangaHost : ParsedHttpSource() { .add("User-Agent", USER_AGENT) .add("Referer", baseUrl) - private fun genericMangaFromElement(element: Element): SManga = + private fun genericMangaFromElement(element: Element, attr: String = "src"): SManga = SManga.create().apply { title = element.attr("title").withoutLanguage() - thumbnail_url = element.select("img") - .attr("data-path") - .toLargeUrl() + thumbnail_url = element.select("img").attr(attr).toLargeUrl() setUrlWithoutDomain(element.attr("href").substringBeforeLast("-mh")) } @@ -85,7 +82,7 @@ class MangaHost : ParsedHttpSource() { override fun searchMangaSelector() = "table.table-search > tbody > tr > td:eq(0) > a" - override fun searchMangaFromElement(element: Element): SManga = genericMangaFromElement(element) + override fun searchMangaFromElement(element: Element): SManga = genericMangaFromElement(element, "data-path") override fun searchMangaNextPageSelector(): String? = null @@ -128,17 +125,8 @@ class MangaHost : ParsedHttpSource() { } override fun pageListParse(document: Document): List { - val imagesHtml = document.select("script:containsData(var images)").first()!! - .data() - .substringAfter("var images = [") - .substringBefore("];") - .replace(SCRIPT_REGEX, "") - - return Jsoup.parse(imagesHtml) - .select("a img") - .mapIndexed { i, el -> - Page(i, document.location(), el.attr("src")) - } + return document.select("div#slider a img") + .mapIndexed { i, el -> Page(i, document.location(), el.attr("src")) } } override fun imageUrlParse(document: Document) = "" @@ -167,7 +155,7 @@ class MangaHost : ParsedHttpSource() { private fun String.withoutLanguage(): String = replace(LANG_REGEX, "") - private fun String.toLargeUrl(): String = replace(IMAGE_REGEX, "_large.") + private fun String.toLargeUrl(): String = replace(IMAGE_REGEX, ".") private fun Elements.textWithoutLabel(): String = text()!!.substringAfter(":").trim() @@ -178,7 +166,5 @@ class MangaHost : ParsedHttpSource() { private val IMAGE_REGEX = "_(small|medium|xmedium)\\.".toRegex() private val DATE_FORMAT by lazy { SimpleDateFormat("MMM dd, yyyy", Locale.ENGLISH) } - - private val SCRIPT_REGEX = "[\",]".toRegex() } }