Rename GS and add GH back. (#10307)

multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt

@@ -58,7 +58,7 @@ class DoujinHentai : Madara("DoujinHentai", "https://doujinhentai.net", "es", Si
     override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
     override fun chapterListSelector() = "ul.main.version-chap > li.wp-manga-chapter:not(:last-child)" // removing empty li
     override val pageListParseSelector = "div#all > img.img-responsive"
-    
+
     override fun getFilterList() = FilterList(
         Filter.Header("Solo funciona si la consulta está en blanco"),
         GenreSelectFilter()

multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt

@@ -7,15 +7,15 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 
-class GeassScanlator : Madara(
+class OkamishiScans : Madara(
-    "Geass Scanlator",
+    "Okamishi Scans",
     "https://geassscan.net",
     "pt-BR",
     SimpleDateFormat("yyyy-MM-dd", Locale("pt", "BR"))
 ) {
 
-    // Website changed from WpMangaStream to Madara (again).
+    // The scanlator changed their name.
-    override val versionId: Int = 2
+    override val id: Long = 1228448816486487111
 
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))

multisrc/overrides/madara/kitsuneniji/src/KitsuneNiji.kt

@@ -18,4 +18,3 @@ class KitsuneNiji : Madara(
         .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
         .build()
 }
-

multisrc/overrides/madara/tiempodewebeo/src/TiempoDeWebeo.kt

@@ -10,4 +10,3 @@ class TiempoDeWebeo : Madara(
     "es",
     SimpleDateFormat("dd/MM/yyyy", Locale("es"))
 )
-

multisrc/overrides/madara/tonizutoon/src/TonizuToon.kt

@@ -10,4 +10,3 @@ class TonizuToon : Madara(
     "tr",
     SimpleDateFormat("MMMMM d, yyyy", Locale("tr"))
 )
-

multisrc/overrides/wpmangareader/alphascans/src/AlphaScans.kt

@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
-import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import rx.Observable

multisrc/overrides/wpmangastream/geasshentai/src/GeassHentai.kt

@@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.extension.pt.geasshentai
+
+import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
+import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream
+import okhttp3.OkHttpClient
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+
+class GeassHentai : WPMangaStream(
+    "Geass Hentai",
+    "https://geassscan.xyz",
+    "pt-BR",
+    dateFormat = SimpleDateFormat("MMMMM d, yyyy", Locale("pt", "BR"))
+) {
+
+    // Source changed from Madara to WpMangaStream.
+    override val versionId: Int = 2
+
+    override val client: OkHttpClient = super.client.newBuilder()
+        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .build()
+
+    override val altName: String = "Nome alternativo: "
+}

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

@@ -91,7 +91,6 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Furio Scans", "https://furioscans.com", "pt-BR", overrideVersionCode = 4),
         SingleLang("GalaxyDegenScans", "https://gdstmp.site", "en", overrideVersionCode = 3),
         SingleLang("Gatemanga", "https://gatemanga.com", "ar", overrideVersionCode = 1),
-        SingleLang("Geass Scanlator", "https://geassscan.net", "pt-BR", overrideVersionCode = 3),
         SingleLang("Gemanga", "https://gemanga.com", "ar", overrideVersionCode = 1),
         SingleLang("Glory Scans", "https://gloryscan.com", "pt-BR", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Gogoscans", "https://www.gogoscans.com", "en"),
@@ -327,6 +326,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Novels Town", "https://novelstown.cyou", "ar"),
         SingleLang("OTksScanlator", "https://otkscanlator.xyz", "pt-BR", isNsfw = true, className = "OtksScanlator"),
         SingleLang("Oh No Manga", "https://ohnomanga.com", "en", isNsfw = true),
+        SingleLang("Okamishi Scans", "https://geassscan.net", "pt-BR", pkgName = "geassscanlator", overrideVersionCode = 4),
         SingleLang("Olho da Lua", "https://olhodalua.xyz", "pt-BR", className = "OlhoDaLua", overrideVersionCode = 2),
         SingleLang("Origami Orpheans", "https://origami-orpheans.com.br", "pt-BR", overrideVersionCode = 3),
         SingleLang("Ow Scan", "https://owscan.com", "pt-BR", overrideVersionCode = 1),

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt

@@ -53,7 +53,8 @@ class WPMangaStreamGenerator : ThemeSourceGenerator {
         SingleLang("Random Scans", "https://randomscans.xyz", "en"),
         SingleLang("Fênix Scanlator", "https://fenixscanlator.xyz", "pt-BR", className = "FenixScanlator", overrideVersionCode = 2),
         SingleLang("Phantom Scans", "https://phantomscans.com", "en", overrideVersionCode = 1),
-        SingleLang("Omega Scans", "https://omegascans.org", "en", isNsfw = true)
+        SingleLang("Omega Scans", "https://omegascans.org", "en", isNsfw = true),
+        SingleLang("Geass Hentai", "https://geassscan.xyz", "pt-BR", isNsfw = true, overrideVersionCode = 2)
     )
 
     companion object {