From 8eb7980779455ce24f7fe198ae25ab340a70f569 Mon Sep 17 00:00:00 2001 From: Suyash Mittal Date: Sat, 22 Oct 2022 07:11:36 +0530 Subject: [PATCH] MangaPro URL change and theme change to Madara (#13939) * MangaPro URL change and theme change to Madara * Update versionId Co-authored-by: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com> Co-authored-by: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com> --- .../mangaproz/res/mipmap-hdpi/ic_launcher.png | Bin .../mangaproz/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../mangaproz/res/web_hi_res_512.png | Bin .../madara/mangaproz/src/MangaPro.kt | 17 ++++++ .../mangathemesia/mangaproz/src/MangaPro.kt | 51 ------------------ .../multisrc/madara/MadaraGenerator.kt | 1 + .../mangathemesia/MangaThemesiaGenerator.kt | 1 - 10 files changed, 18 insertions(+), 52 deletions(-) rename multisrc/overrides/{mangathemesia => madara}/mangaproz/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/mangaproz/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/mangaproz/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/mangaproz/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/mangaproz/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/madara/mangaproz/src/MangaPro.kt delete mode 100644 multisrc/overrides/mangathemesia/mangaproz/src/MangaPro.kt diff --git a/multisrc/overrides/mangathemesia/mangaproz/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangaproz/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/mangaproz/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/mangaproz/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/mangaproz/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangaproz/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/mangaproz/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/mangaproz/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/mangaproz/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaproz/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/mangaproz/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/mangaproz/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/mangaproz/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaproz/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/mangaproz/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/mangaproz/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/mangaproz/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/mangaproz/res/web_hi_res_512.png b/multisrc/overrides/madara/mangaproz/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/mangathemesia/mangaproz/res/web_hi_res_512.png rename to multisrc/overrides/madara/mangaproz/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/mangaproz/src/MangaPro.kt b/multisrc/overrides/madara/mangaproz/src/MangaPro.kt new file mode 100644 index 000000000..e6bc33ac5 --- /dev/null +++ b/multisrc/overrides/madara/mangaproz/src/MangaPro.kt @@ -0,0 +1,17 @@ +package eu.kanade.tachiyomi.extension.ar.mangaproz + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.network.interceptor.rateLimit +import okhttp3.OkHttpClient +import java.util.concurrent.TimeUnit + +class MangaPro : Madara("Manga Pro", "https://manga-pro.com", "ar") { + // Theme changed from MangaThemesia to Madara. + override val versionId = 2 + + override val client: OkHttpClient = network.cloudflareClient.newBuilder() + .connectTimeout(10, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .rateLimit(4) + .build() +} diff --git a/multisrc/overrides/mangathemesia/mangaproz/src/MangaPro.kt b/multisrc/overrides/mangathemesia/mangaproz/src/MangaPro.kt deleted file mode 100644 index 3995a1b8f..000000000 --- a/multisrc/overrides/mangathemesia/mangaproz/src/MangaPro.kt +++ /dev/null @@ -1,51 +0,0 @@ -package eu.kanade.tachiyomi.extension.ar.mangaproz - -import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import eu.kanade.tachiyomi.source.model.SChapter -import eu.kanade.tachiyomi.source.model.SManga -import okhttp3.OkHttpClient -import okhttp3.Response -import org.jsoup.nodes.Document -import org.jsoup.nodes.Element -import java.util.concurrent.TimeUnit - -class MangaPro : MangaThemesia("Manga Pro", "https://mangaprotm.com", "ar") { - override val id: Long = 964048798769065340 - - override val client: OkHttpClient = network.cloudflareClient.newBuilder() - .connectTimeout(10, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - .rateLimit(4) - .build() - - override fun chapterListParse(response: Response): List = - super.chapterListParse(response).filter { it.url.isNotEmpty() } - - override fun chapterFromElement(element: Element): SChapter { - val urlElement = element.select(".lchx > a, span.leftoff a, div.eph-num > a").first() - val chapter = SChapter.create() - - // ignore chapters that are protected behind ads shortners. - if (urlElement.attr("href").startsWith(baseUrl)) - chapter.setUrlWithoutDomain(urlElement.attr("href")) - else - chapter.setUrlWithoutDomain("") - - chapter.name = if (urlElement.select("span.chapternum") - .isNotEmpty() - ) urlElement.select("span.chapternum").text() else urlElement.text() - chapter.name = chapter.name.replace("-*free".toRegex(RegexOption.IGNORE_CASE), "") - chapter.date_upload = - element.select("span.rightoff, time, span.chapterdate").firstOrNull()?.text() - .parseChapterDate() - return chapter - } - - override fun mangaDetailsParse(document: Document): SManga = - super.mangaDetailsParse(document).apply { - document.selectFirst(seriesDetailsSelector)?.let { infoElement -> - thumbnail_url = infoElement.select(seriesThumbnailSelector).attr("abs:data-lazy-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 cbede9ea0..379127132 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 @@ -202,6 +202,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga Mitsu", "https://mangamitsu.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Manga One Love", "https://mangaonelove.site/", "ru", isNsfw = true), SingleLang("Manga Online Team", "https://mangaonlineteam.com", "en"), + SingleLang("Manga Pro", "https://manga-pro.com", "ar", pkgName = "mangaproz", overrideVersionCode = 4), SingleLang("Manga Queen", "https://mangaqueen.net", "en"), SingleLang("Manga Read", "https://mangaread.co", "en", overrideVersionCode = 1), SingleLang("Manga Rock Team", "https://mangarockteam.com", "en", overrideVersionCode = 1), 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 f7ed3cc85..bf265b054 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 @@ -52,7 +52,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Legion Scan", "https://legionscans.com", "es"), SingleLang("LianScans", "https://www.lianscans.my.id", "id", isNsfw = true), SingleLang("Magus Manga", "https://magusmanga.com", "ar"), - SingleLang("Manga Pro", "https://mangaprotm.com", "ar", pkgName = "mangaproz", overrideVersionCode = 3), SingleLang("Manga Raw.org", "https://mangaraw.org", "ja", className = "MangaRawOrg", overrideVersionCode = 1), SingleLang("Mangacim", "https://www.mangacim.com", "tr", overrideVersionCode = 1), SingleLang("MangaKita", "https://mangakita.net", "id", overrideVersionCode = 1),