From bd39e11141cbf54ed32840a097d49350ffb250f1 Mon Sep 17 00:00:00 2001 From: nzoba <55888232+nzoba@users.noreply.github.com> Date: Tue, 11 Oct 2022 13:59:55 +0200 Subject: [PATCH] Migrate FusionScanlation (#13810) * Moves FusionScanlation * Add versionId --- .../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 .../fusionscanlation/res/web_hi_res_512.png | Bin .../fusionscanlation/src/FusionScanlation.kt | 23 ++++++++++++++++++ .../fusionscanlation/src/FusionScanlation.kt | 17 ------------- .../multisrc/madara/MadaraGenerator.kt | 1 + .../mangathemesia/MangaThemesiaGenerator.kt | 1 - 10 files changed, 24 insertions(+), 18 deletions(-) rename multisrc/overrides/{mangathemesia => madara}/fusionscanlation/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/fusionscanlation/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/fusionscanlation/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/fusionscanlation/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/fusionscanlation/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/fusionscanlation/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/madara/fusionscanlation/src/FusionScanlation.kt delete mode 100644 multisrc/overrides/mangathemesia/fusionscanlation/src/FusionScanlation.kt diff --git a/multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/fusionscanlation/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/fusionscanlation/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/fusionscanlation/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/fusionscanlation/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/fusionscanlation/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/fusionscanlation/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/fusionscanlation/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/fusionscanlation/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/fusionscanlation/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/fusionscanlation/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/fusionscanlation/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/fusionscanlation/res/web_hi_res_512.png b/multisrc/overrides/madara/fusionscanlation/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/mangathemesia/fusionscanlation/res/web_hi_res_512.png rename to multisrc/overrides/madara/fusionscanlation/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/fusionscanlation/src/FusionScanlation.kt b/multisrc/overrides/madara/fusionscanlation/src/FusionScanlation.kt new file mode 100644 index 000000000..97e68fa1f --- /dev/null +++ b/multisrc/overrides/madara/fusionscanlation/src/FusionScanlation.kt @@ -0,0 +1,23 @@ +package eu.kanade.tachiyomi.extension.es.fusionscanlation + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.network.interceptor.rateLimit +import okhttp3.OkHttpClient +import java.text.SimpleDateFormat +import java.util.Locale +import java.util.concurrent.TimeUnit + +class FusionScanlation : Madara("Fusion Scanlation", "https://fusionscanlation.com", "es", SimpleDateFormat("d 'de' MMMM 'de' yyyy", Locale("es"))) { + + override val versionId = 2 + + override val seriesTypeSelector = ".post-content_item:contains(Tipo) .summary-content" + override val altNameSelector = ".post-content_item:contains(Nombre Alternativo) .summary-content" + override val altName = "Nombre alternativo: " + + override val client: OkHttpClient = network.cloudflareClient.newBuilder() + .connectTimeout(10, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .rateLimit(1, 2) + .build() +} diff --git a/multisrc/overrides/mangathemesia/fusionscanlation/src/FusionScanlation.kt b/multisrc/overrides/mangathemesia/fusionscanlation/src/FusionScanlation.kt deleted file mode 100644 index 49aa928f4..000000000 --- a/multisrc/overrides/mangathemesia/fusionscanlation/src/FusionScanlation.kt +++ /dev/null @@ -1,17 +0,0 @@ -package eu.kanade.tachiyomi.extension.es.fusionscanlation - -import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class FusionScanlation : MangaThemesia("Fusion Scanlation", "https://fusionscanlation.com", "es", dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es"))) { - - override val client: OkHttpClient = network.cloudflareClient.newBuilder() - .connectTimeout(10, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - .rateLimit(1, 2) - .build() -} 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 140cfd400..e803bbbf1 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 @@ -116,6 +116,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Fug Manga", "https://fugmanga.net", "ar", overrideVersionCode = 1), SingleLang("Fukushuu no Yuusha", "https://fny-scantrad.com", "fr", overrideVersionCode = 2), SingleLang("Furio Scans", "https://furioscans.com", "pt-BR", overrideVersionCode = 4), + SingleLang("Fusion Scanlation", "https://fusionscanlation.com", "es", className = "FusionScanlation", overrideVersionCode = 3), SingleLang("GalaxyDegenScans", "https://gdstmp.site", "en", overrideVersionCode = 3), SingleLang("Gatemanga", "https://gatemanga.com", "ar", overrideVersionCode = 1), SingleLang("GeassToon", "https://geasstoon.com", "tr"), 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 d7c6f06e5..74121b567 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 @@ -32,7 +32,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Dojing.net", "https://dojing.net", "id", isNsfw = true, className = "DojingNet"), SingleLang("FlameScans.fr", "https://flamescans.fr", "fr", className = "FlameScansFR"), SingleLang("Franxx Mangás", "https://franxxmangas.net", "pt-BR", className = "FranxxMangas", isNsfw = true), - SingleLang("Fusion Scanlation", "https://fusionscanlation.com", "es", className = "FusionScanlation", overrideVersionCode = 2), SingleLang("Gabut Scans", "https://gabutscans.com", "id", overrideVersionCode = 1), SingleLang("Gecenin Lordu", "https://geceninlordu.com", "tr", overrideVersionCode = 1), SingleLang("GoGoManga", "https://gogomanga.fun", "en", overrideVersionCode = 1),