Make OS a multilang source. (#12266)

multisrc/overrides/madara/olympusscanlation/src/OlympusScanlationFactory.kt

@@ -0,0 +1,35 @@
+package eu.kanade.tachiyomi.extension.all.olympusscanlation
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
+import eu.kanade.tachiyomi.source.SourceFactory
+import okhttp3.OkHttpClient
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+
+class OlympusScanlationFactory : SourceFactory {
+    override fun createSources() = listOf(
+        OlympusScanlationBr(),
+        OlympusScanlationEs()
+    )
+}
+
+abstract class OlympusScanlation(
+    override val baseUrl: String,
+    lang: String,
+    dateFormat: SimpleDateFormat = SimpleDateFormat("MMMMM dd, yyyy", Locale.US)
+) : Madara("Olympus Scanlation", baseUrl, lang, dateFormat)
+
+class OlympusScanlationEs : OlympusScanlation("https://olympusscanlation.com", "es")
+
+class OlympusScanlationBr : OlympusScanlation(
+    "https://br.olympusscanlation.com",
+    "pt-BR",
+    SimpleDateFormat("MMMMM dd, yyyy", Locale("pt", "BR"))
+) {
+
+    override val client: OkHttpClient = super.client.newBuilder()
+        .rateLimit(1, 2, TimeUnit.SECONDS)
+        .build()
+}

multisrc/overrides/madara/vaposcan/src/VapoScan.kt

@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.extension.pt.vaposcan
-
-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 VapoScan : Madara(
-    "Vapo Scan",
-    "https://vaposcans.com",
-    "pt-BR",
-    SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR"))
-) {
-
-    // Source changed from WpMangaStream to Madara.
-    override val versionId = 2
-
-    override val client: OkHttpClient = super.client.newBuilder()
-        .rateLimit(1, 2, TimeUnit.SECONDS)
-        .build()
-
-    override val useNewChapterEndpoint = true
-}

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt

@@ -16,6 +16,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 9),
         MultiLang("MangaForFree.net", "https://mangaforfree.net", listOf("en", "ko", "all"), isNsfw = true, className = "MangaForFreeFactory", pkgName = "mangaforfree", overrideVersionCode = 1),
         MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc", overrideVersionCode = 2),
+        MultiLang("Olympus Scanlation", "https://olympusscanlation.com", listOf("es", "pt-BR")),
         MultiLang("Reaper Scans", "https://reaperscans.com", listOf("en", "pt-BR", "fr", "id", "tr"), className = "ReaperScansFactory", pkgName = "reaperscans", overrideVersionCode = 5),
         MultiLang("Seven King Scanlation", "https://sksubs.net", listOf("es", "en"), isNsfw = true),
         MultiLang("YugenMangas", "https://yugenmangas.com", listOf("es", "pt-BR"), overrideVersionCode = 3),
@@ -354,7 +355,6 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("NovelMic", "https://novelmic.com", "en", overrideVersionCode = 1),
         SingleLang("Novels Town", "https://novelstown.cyou", "ar"),
         SingleLang("Oh No Manga", "https://ohnomanga.com", "en", isNsfw = true),
-        SingleLang("Olympus Scanlation", "https://olympusscanlation.com", "es"),
         SingleLang("Ow Scan", "https://owscan.com", "pt-BR", overrideVersionCode = 1),
         SingleLang("Paean Scans", "https://paeanscans.com", "en", overrideVersionCode = 1),
         SingleLang("Painful Nightz Scan", "https://painfulnightz.com", "en", overrideVersionCode = 1),
@@ -445,7 +445,6 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Uzay Manga", "https://uzaymanga.com", "tr"),
         SingleLang("Vanguard Bun", "https://vanguardbun.com", "en", overrideVersionCode = 1),
         SingleLang("Vapo Hentai", "http://xxx.vaposcans.com", "pt-BR", isNsfw = true),
-        SingleLang("Vapo Scan", "https://vaposcans.com", "pt-BR", overrideVersionCode = 1),
         SingleLang("Visbellum", "https://visbellum.com", "pt-BR", overrideVersionCode = 2),
         SingleLang("WD Scans (Wicked Dragon Scans)", "https://wdscans.com", "en", className = "WDScans"),
         SingleLang("Wakamics", "https://wakamics.net", "en"),