From 38b95e3913455fd6f69ddf56176ac492fb5cf67d Mon Sep 17 00:00:00 2001
From: Alessandro Jean <alessandrojean@gmail.com>
Date: Fri, 4 Feb 2022 07:27:24 -0300
Subject: [PATCH] Migrate MS from Madara to WpMangaReader (closes #10676).
(#10682)
---
.run/WPMangaReaderGenerator.run.xml | 17 ------------
.../madara/modescanlator/src/ModeScanlator.kt | 24 -----------------
.../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
.../modescanlator/res/web_hi_res_512.png | Bin
.../modescanlator/src/ModeScanlator.kt | 25 ++++++++++++++++++
.../multisrc/madara/MadaraGenerator.kt | 1 -
.../wpmangareader/WPMangaReaderGenerator.kt | 1 +
11 files changed, 26 insertions(+), 42 deletions(-)
delete mode 100644 .run/WPMangaReaderGenerator.run.xml
delete mode 100644 multisrc/overrides/madara/modescanlator/src/ModeScanlator.kt
rename multisrc/overrides/{madara => wpmangareader}/modescanlator/res/mipmap-hdpi/ic_launcher.png (100%)
rename multisrc/overrides/{madara => wpmangareader}/modescanlator/res/mipmap-mdpi/ic_launcher.png (100%)
rename multisrc/overrides/{madara => wpmangareader}/modescanlator/res/mipmap-xhdpi/ic_launcher.png (100%)
rename multisrc/overrides/{madara => wpmangareader}/modescanlator/res/mipmap-xxhdpi/ic_launcher.png (100%)
rename multisrc/overrides/{madara => wpmangareader}/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png (100%)
rename multisrc/overrides/{madara => wpmangareader}/modescanlator/res/web_hi_res_512.png (100%)
create mode 100644 multisrc/overrides/wpmangareader/modescanlator/src/ModeScanlator.kt
diff --git a/.run/WPMangaReaderGenerator.run.xml b/.run/WPMangaReaderGenerator.run.xml
deleted file mode 100644
index 5aab1ea24..000000000
--- a/.run/WPMangaReaderGenerator.run.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="WPMangaReaderGenerator" type="JetRunConfigurationType" nameIsGenerated="true">
- <module name="tachiyomi-extensions.multisrc" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="MAIN_CLASS_NAME" value="eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReaderGenerator" />
- <option name="WORKING_DIRECTORY" value="" />
- <method v="2">
- <option name="Make" enabled="true" />
- <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktFormat" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="" />
- <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktLint" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="" />
- </method>
- </configuration>
-</component>
\ No newline at end of file
diff --git a/multisrc/overrides/madara/modescanlator/src/ModeScanlator.kt b/multisrc/overrides/madara/modescanlator/src/ModeScanlator.kt
deleted file mode 100644
index 577c15663..000000000
--- a/multisrc/overrides/madara/modescanlator/src/ModeScanlator.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.kanade.tachiyomi.extension.pt.modescanlator
-
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
-import eu.kanade.tachiyomi.multisrc.madara.Madara
-import okhttp3.OkHttpClient
-import java.text.SimpleDateFormat
-import java.util.Locale
-import java.util.concurrent.TimeUnit
-
-class ModeScanlator : Madara(
- "Mode Scanlator",
- "https://modescanlator.com",
- "pt-BR",
- SimpleDateFormat("MMMMM dd, yyyy", Locale("pt", "BR"))
-) {
-
- override val client: OkHttpClient = super.client.newBuilder()
- .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
- .build()
-
- override fun popularMangaSelector() = "div.page-item-detail.manga"
-
- override val altName: String = "Nome alternativo: "
-}
diff --git a/multisrc/overrides/madara/modescanlator/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/modescanlator/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/modescanlator/res/mipmap-hdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/modescanlator/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/modescanlator/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/modescanlator/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/modescanlator/res/mipmap-mdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/modescanlator/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/modescanlator/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/modescanlator/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/modescanlator/res/mipmap-xhdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/modescanlator/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/modescanlator/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/modescanlator/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/modescanlator/res/mipmap-xxhdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/modescanlator/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/madara/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png
rename to multisrc/overrides/wpmangareader/modescanlator/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/madara/modescanlator/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/modescanlator/res/web_hi_res_512.png
similarity index 100%
rename from multisrc/overrides/madara/modescanlator/res/web_hi_res_512.png
rename to multisrc/overrides/wpmangareader/modescanlator/res/web_hi_res_512.png
diff --git a/multisrc/overrides/wpmangareader/modescanlator/src/ModeScanlator.kt b/multisrc/overrides/wpmangareader/modescanlator/src/ModeScanlator.kt
new file mode 100644
index 000000000..0bcdd8b79
--- /dev/null
+++ b/multisrc/overrides/wpmangareader/modescanlator/src/ModeScanlator.kt
@@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.extension.pt.modescanlator
+
+import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader
+import okhttp3.OkHttpClient
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+
+class ModeScanlator : WPMangaReader(
+ "Mode Scanlator",
+ "https://modescanlator.com",
+ "pt-BR",
+ dateFormat = SimpleDateFormat("MMMMM dd, yyyy", Locale("pt", "BR"))
+) {
+
+ // Site changed from Madara to WpMangaReader.
+ override val versionId: Int = 2
+
+ override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+ .addNetworkInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+ .build()
+
+ override val altName = "Nome alternativo: "
+}
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 6abf254bd..0f482ead3 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
@@ -323,7 +323,6 @@ class MadaraGenerator : ThemeSourceGenerator {
SingleLang("MiniTwo Scan", "https://minitwoscan.com", "pt-BR"),
SingleLang("Mirad Scanlator", "https://miradscanlator.site", "pt-BR", overrideVersionCode = 1),
SingleLang("Mixed Manga", "https://mixedmanga.com", "en", overrideVersionCode = 1),
- SingleLang("Mode Scanlator", "https://modescanlator.com", "pt-BR", overrideVersionCode = 2),
SingleLang("Momo no Hana Scan", "https://momonohanascan.com", "pt-BR", className = "MomoNoHanaScan", overrideVersionCode = 1),
SingleLang("Mortals Groove", "https://mortalsgroove.com", "en", overrideVersionCode = 1),
SingleLang("Muctau", "https://muctau.com", "en", overrideVersionCode = 1),
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
index 17a272773..1b0d49808 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt
@@ -26,6 +26,7 @@ class WPMangaReaderGenerator : ThemeSourceGenerator {
SingleLang("Graze Scans", "https://grazescans.com", "en", overrideVersionCode = 2),
SingleLang("Mangás Chan", "https://mangaschan.com", "pt-BR", className = "MangasChan"),
SingleLang("Martial Manga", "https://martialmanga.com", "es"),
+ SingleLang("Mode Scanlator", "https://modescanlator.com", "pt-BR", overrideVersionCode = 7),
SingleLang("Ngomik", "https://ngomik.net", "id", overrideVersionCode = 1),
SingleLang("Sekaikomik", "https://www.sekaikomik.site", "id", isNsfw = true, overrideVersionCode = 8),
SingleLang("Davey Scans", "https://daveyscans.com", "id", overrideVersionCode = 1),