Migrate MS from Madara to WpMangaReader (closes #10676). (#10682)

.run/WPMangaReaderGenerator.run.xml

@@ -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>

multisrc/overrides/madara/modescanlator/src/ModeScanlator.kt

@@ -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: "
-}

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: "
+}

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),

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),