From fdf664742c52f6d579c1660c7dfb5c30d542eebf Mon Sep 17 00:00:00 2001 From: Vetle Ledaal Date: Fri, 15 Sep 2023 18:58:33 +0000 Subject: [PATCH] PMScans: move to Madara (#17957) --- .../pmscans/res/mipmap-hdpi/ic_launcher.png | Bin .../pmscans/res/mipmap-mdpi/ic_launcher.png | Bin .../pmscans/res/mipmap-xhdpi/ic_launcher.png | Bin .../pmscans/res/mipmap-xxhdpi/ic_launcher.png | Bin .../pmscans/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../pmscans/res/web_hi_res_512.png | Bin .../overrides/madara/pmscans/src/PMScans.kt | 17 +++++++++++++++++ .../multisrc/madara/MadaraGenerator.kt | 1 + .../mangathemesia/MangaThemesiaGenerator.kt | 1 - 9 files changed, 18 insertions(+), 1 deletion(-) rename multisrc/overrides/{mangathemesia => madara}/pmscans/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/pmscans/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/pmscans/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/pmscans/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/pmscans/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/pmscans/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/madara/pmscans/src/PMScans.kt diff --git a/multisrc/overrides/mangathemesia/pmscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/pmscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/pmscans/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/pmscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/pmscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/pmscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/pmscans/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/pmscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/pmscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/pmscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/pmscans/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/pmscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/pmscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/pmscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/pmscans/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/pmscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/pmscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/pmscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/pmscans/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/pmscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/pmscans/res/web_hi_res_512.png b/multisrc/overrides/madara/pmscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/mangathemesia/pmscans/res/web_hi_res_512.png rename to multisrc/overrides/madara/pmscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/pmscans/src/PMScans.kt b/multisrc/overrides/madara/pmscans/src/PMScans.kt new file mode 100644 index 000000000..98969144e --- /dev/null +++ b/multisrc/overrides/madara/pmscans/src/PMScans.kt @@ -0,0 +1,17 @@ +package eu.kanade.tachiyomi.extension.en.pmscans + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class PMScans : Madara( + "PMScans", + "https://rackusreads.com", + "en", + dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.ROOT), +) { + override val versionId = 2 + override val useNewChapterEndpoint = true + + override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/" +} 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 083b03cac..0c3e8fc5e 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 @@ -397,6 +397,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Pink Sea Unicorn", "https://psunicorn.com", "pt-BR", isNsfw = true), SingleLang("Pirulito Rosa", "https://pirulitorosa.site", "pt-BR", isNsfw = true), SingleLang("Platinum Crown", "https://platinumscans.com", "en", overrideVersionCode = 1), + SingleLang("PMScans", "https://rackusreads.com", "en"), SingleLang("Pojok Manga", "https://pojokmanga.net", "id", overrideVersionCode = 4), SingleLang("PoManga", "https://pomanga.com", "en"), SingleLang("Pony Manga", "https://ponymanga.com", "en", isNsfw = true), 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 8fe253596..3fdd27f79 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 @@ -103,7 +103,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Phantom Scans", "https://phantomscans.com", "en", overrideVersionCode = 1), SingleLang("PhenixScans", "https://phenixscans.fr", "fr", className = "PhenixScans", overrideVersionCode = 1), SingleLang("Pi Scans", "https://piscans.in", "id", overrideVersionCode = 1), - SingleLang("PMScans", "https://rackusreads.com", "en", overrideVersionCode = 3), SingleLang("PotatoManga", "https://potatomanga.xyz", "ar"), SingleLang("Raiki Scan", "https://raikiscan.com", "es"), SingleLang("Raven Scans", "https://ravenscans.com", "en", overrideVersionCode = 1),