From 8eac6fbfec428fe48f485da51ae66c733b665dd2 Mon Sep 17 00:00:00 2001 From: seew3l <90949336+seew3l@users.noreply.github.com> Date: Sat, 18 Feb 2023 10:31:05 -0500 Subject: [PATCH] Migrate "Cartel de Manhwas" to MangaThemesia (#15357) * Change theme to MangaThemesia * Fix Url --- .../carteldemanhwas/src/CarteldeManhwas.kt | 7 ---- .../res/mipmap-hdpi/ic_launcher.png | Bin .../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 .../carteldemanhwas/res/web_hi_res_512.png | Bin .../carteldemanhwas/src/CarteldeManhwas.kt | 30 ++++++++++++++++++ .../multisrc/madara/MadaraGenerator.kt | 1 - .../mangathemesia/MangaThemesiaGenerator.kt | 1 + 10 files changed, 31 insertions(+), 8 deletions(-) delete mode 100644 multisrc/overrides/madara/carteldemanhwas/src/CarteldeManhwas.kt rename multisrc/overrides/{madara => mangathemesia}/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/carteldemanhwas/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/mangathemesia/carteldemanhwas/src/CarteldeManhwas.kt diff --git a/multisrc/overrides/madara/carteldemanhwas/src/CarteldeManhwas.kt b/multisrc/overrides/madara/carteldemanhwas/src/CarteldeManhwas.kt deleted file mode 100644 index b426dcb16..000000000 --- a/multisrc/overrides/madara/carteldemanhwas/src/CarteldeManhwas.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.es.carteldemanhwas - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class CarteldeManhwas : Madara("Cartel de Manhwas", "https://carteldemws.com", "es", dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es"))) diff --git a/multisrc/overrides/madara/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/carteldemanhwas/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/carteldemanhwas/res/web_hi_res_512.png b/multisrc/overrides/mangathemesia/carteldemanhwas/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/carteldemanhwas/res/web_hi_res_512.png rename to multisrc/overrides/mangathemesia/carteldemanhwas/res/web_hi_res_512.png diff --git a/multisrc/overrides/mangathemesia/carteldemanhwas/src/CarteldeManhwas.kt b/multisrc/overrides/mangathemesia/carteldemanhwas/src/CarteldeManhwas.kt new file mode 100644 index 000000000..d7291369d --- /dev/null +++ b/multisrc/overrides/mangathemesia/carteldemanhwas/src/CarteldeManhwas.kt @@ -0,0 +1,30 @@ +package eu.kanade.tachiyomi.extension.es.carteldemanhwas + +import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia +import java.text.SimpleDateFormat +import java.util.Locale + +class CarteldeManhwas : MangaThemesia( + "Cartel de Manhwas", + "https://carteldemanhwas.com", + "es", + mangaUrlDirectory = "/series", + dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es")), +) { + override val hasProjectPage = true + override val projectPageString = "/proyectos" + + override fun searchMangaSelector() = ".utao .uta .imgu:not(:has(span.novelabel)), " + + ".listupd .bs .bsx:not(:has(span.novelabel)), " + + ".listo .bs .bsx:not(:has(span.novelabel))" + + private class StatusFilter : SelectFilter( + "Status", + arrayOf( + Pair("All", ""), + Pair("Ongoing", "ongoing"), + Pair("Completed", "completed"), + Pair("Hiatus", "hiatus"), + ), + ) +} 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 0717cee1c..a1dbebd96 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 @@ -59,7 +59,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Boruto Explorer", "https://leitor.borutoexplorer.com.br", "pt-BR", overrideVersionCode = 1), SingleLang("BoysLove", "https://boyslove.me", "en", isNsfw = true, overrideVersionCode = 3), SingleLang("Café com Yaoi", "http://cafecomyaoi.com.br", "pt-BR", pkgName = "cafecomyaoi", className = "CafeComYaoi", isNsfw = true, overrideVersionCode = 1), - SingleLang("Cartel de Manhwas", "https://carteldemws.com", "es"), SingleLang("CAT-translator", "https://cats-translator.com/manga", "th", className = "CatTranslator", overrideVersionCode = 2), SingleLang("Cat300", "https://cat300.com", "th", isNsfw = true, className = "Cat300", overrideVersionCode = 1), SingleLang("CatOnHeadTranslations", "https://catonhead.com", "en", overrideVersionCode = 2), 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 3f1cb9a9a..9110c2f93 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 @@ -24,6 +24,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("ARESManga", "https://aresmanga.net", "ar", pkgName = "iimanga", overrideVersionCode = 4), SingleLang("Azure Scans", "https://azuremanga.com", "en", overrideVersionCode = 1), SingleLang("Boosei", "https://boosei.net", "id", overrideVersionCode = 2), + SingleLang("Cartel de Manhwas", "https://carteldemanhwas.com", "es", overrideVersionCode = 5), SingleLang("Clayrer", "https://clayrer.net", "es"), SingleLang("Constellar Scans", "https://constellarscans.com", "en", isNsfw = true, overrideVersionCode = 14), SingleLang("Cosmic Scans", "https://cosmicscans.com", "en", overrideVersionCode = 1),