From 66cde3a9630437cf110a3c944aa277890d49c2d0 Mon Sep 17 00:00:00 2001 From: bapeey <90949336+bapeey@users.noreply.github.com> Date: Sat, 2 Dec 2023 10:42:03 -0500 Subject: [PATCH] =?UTF-8?q?MangaRead.org:=20Fix=20"image=20couldn=C2=B4t?= =?UTF-8?q?=20be=20loaded"=20on=20mobile=20UA=20(#19140)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix imgAttr selector --- .../madara/mangareadorg/src/MangaReadOrg.kt | 18 +++++++++++++++++- .../multisrc/madara/MadaraGenerator.kt | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/multisrc/overrides/madara/mangareadorg/src/MangaReadOrg.kt b/multisrc/overrides/madara/mangareadorg/src/MangaReadOrg.kt index 090a26f3f..2f9121aa3 100644 --- a/multisrc/overrides/madara/mangareadorg/src/MangaReadOrg.kt +++ b/multisrc/overrides/madara/mangareadorg/src/MangaReadOrg.kt @@ -1,7 +1,23 @@ package eu.kanade.tachiyomi.extension.en.mangareadorg import eu.kanade.tachiyomi.multisrc.madara.Madara +import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale -class MangaReadOrg : Madara("MangaRead.org", "https://www.mangaread.org", "en", SimpleDateFormat("dd.MM.yyy", Locale.US)) +class MangaReadOrg : Madara( + "MangaRead.org", + "https://www.mangaread.org", + "en", + SimpleDateFormat("dd.MM.yyy", Locale.US), +) { + override fun imageFromElement(element: Element): String? { + return when { + element.hasAttr("data-cfsrc") -> element.attr("abs:data-cfsrc") + element.hasAttr("data-src") -> element.attr("abs:data-src") + element.hasAttr("data-lazy-src") -> element.attr("abs:data-lazy-src") + element.hasAttr("srcset") -> element.attr("abs:srcset").substringBefore(" ") + else -> element.attr("abs:src") + } + } +} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 9e3cab489..2ee589327 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -283,7 +283,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MangaPT", "https://mangapt.com", "es", isNsfw = true), SingleLang("MangaPure", "https://mangapure.net", "en", isNsfw = true), SingleLang("MangaRabic", "https://mangaarabics.com", "ar", overrideVersionCode = 1), - SingleLang("MangaRead.org", "https://www.mangaread.org", "en", className = "MangaReadOrg", overrideVersionCode = 1), + SingleLang("MangaRead.org", "https://www.mangaread.org", "en", className = "MangaReadOrg", overrideVersionCode = 2), SingleLang("MangaRolls", "https://mangarolls.net", "en", overrideVersionCode = 1), SingleLang("MangaRosie", "https://mangarosie.in", "en", isNsfw = true), SingleLang("MangaRuby.com", "https://mangaruby.com", "en", isNsfw = true, className = "MangaRubyCom"),