add and update MangazukiOnline, some more of madara splitted (#5709)

* add and update MangazukiOnline

* 12 more of madara

* fix build fail

multisrc/overrides/madara/hscans/src/Hscans.kt

@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.extension.en.hscans
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class Hscans : Madara("Hscans", "https://hscans.com", "en", SimpleDateFormat("MMMM dd, yyyy", Locale.forLanguageTag("es")))

multisrc/overrides/madara/hunterfansub/src/HunterFansub.kt

@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.extension.en.hunterfansub
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Request
+
+class HunterFansub : Madara("Hunter Fansub", "https://hunterfansub.com", "es") {
+    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/biblioteca/page/$page?m_orderby=views", headers)
+    override fun popularMangaNextPageSelector() = "div.nav-previous"
+    override val popularMangaUrlSelector = "div.post-title a:last-child"
+}

multisrc/overrides/madara/ichirinnohanayuri/src/IchirinNoHanaYuri.kt

@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.extension.en.ichirinnohanayuri
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class IchirinNoHanaYuri : Madara("Ichirin No Hana Yuri", "https://ichirinnohanayuri.com.br", "pt-BR", SimpleDateFormat("dd/MM/yyyy", Locale("pt")))

multisrc/overrides/madara/justforfun/src/JustForFun.kt

@@ -0,0 +1,12 @@
+package eu.kanade.tachiyomi.extension.en.justforfun
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class JustForFun : Madara(
+        "Just For Fun",
+        "https://just-for-fun.ru",
+        "ru",
+        dateFormat = SimpleDateFormat("yy.MM.dd", Locale.US)
+)

multisrc/overrides/madara/klikmanga/src/KlikManga.kt

@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.extension.en.klikmanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class KlikManga : Madara("KlikManga", "https://klikmanga.com", "id", SimpleDateFormat("MMMM dd, yyyy", Locale("id")))

multisrc/overrides/madara/kombatch/src/Kombatch.kt

@@ -0,0 +1,7 @@
+package eu.kanade.tachiyomi.extension.en.kombatch
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class Kombatch : Madara("Kombatch", "https://kombatch.com", "id", SimpleDateFormat("d MMMM yyyy", Locale.forLanguageTag("id")))

multisrc/overrides/madara/mangazukionline/src/MangazukiOnline.kt

@@ -0,0 +1,8 @@
+package madara.mangazukionline.src
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+import okhttp3.OkHttpClient
+
+class MangazukiOnline : Madara("Mangazuki.online", "http://mangazukinew.online", "en") {
+    override val client: OkHttpClient = super.client.newBuilder().followRedirects(true).build()
+}

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

@@ -42,7 +42,7 @@ class MadaraGenerator : ThemeSourceGenerator {
             SingleLang("Cutie Pie", "https://cutiepie.ga", "tr"),
             SingleLang("Darkyu Realm", "https://darkyuerealm.site", "pt-BR"),
             SingleLang("Decadence Scans", "https://reader.decadencescans.com", "en"),
-        SingleLang("شبكة كونان العربية", "https://www.manga.detectiveconanar.com", "ar", className="DetectiveConanAr"),
+            SingleLang("شبكة كونان العربية", "https://www.manga.detectiveconanar.com", "ar", className = "DetectiveConanAr"),
             SingleLang("DiamondFansub", "https://diamondfansub.com", "tr"),
             SingleLang("Disaster Scans", "https://disasterscans.com", "en"),
             SingleLang("DoujinHentai", "https://doujinhentai.net", "es", isNsfw = true),
@@ -52,17 +52,34 @@ class MadaraGenerator : ThemeSourceGenerator {
             SingleLang("Einherjar Scan", "https://einherjarscans.space", "en"),
             SingleLang("FDM Scan", "https://fdmscan.com", "pt-BR"),
             SingleLang("1st Kiss", "https://1stkissmanga.com", "en", className = "FirstKissManga", overrideVersionCode = 1),
-        SingleLang("1st Kiss Manhua", "https://1stkissmanhua.com","en", className = "FirstKissManhua"),
+            SingleLang("1st Kiss Manhua", "https://1stkissmanhua.com", "en", className = "FirstKissManhua"),
             SingleLang("FreeWebtoonCoins", "https://freewebtooncoins.com", "en"),
             SingleLang("Furio Scans", "https://furioscans.com", "pt-BR"),
             SingleLang("Gecenin Lordu", "https://geceninlordu.com/", "tr"),
             SingleLang("موقع لترجمة المانجا", "https://golden-manga.com", "ar", className = "GoldenManga"),
+            SingleLang("Graze Scans", "https://grazescans.com/", "en"),
+            SingleLang("Gourmet Scans", "https://gourmetscans.net/", "en"),
             SingleLang("GuncelManga", "https://guncelmanga.com", "tr"),
             SingleLang("Hero Manhua", "https://heromanhua.com", "en"),
             SingleLang("Heroz Scanlation", "https://herozscans.com", "en"),
             SingleLang("Hikari Scan", "https://hikariscan.com.br", "pt-BR"),
             SingleLang("Himera Fansub", "https://himera-fansub.com", "tr"),
             SingleLang("Hiperdex", "https://hiperdex.com", "en"),
+            SingleLang("Hscans", "https://hscans.com", "en"),
+            SingleLang("Hunter Fansub", "https://hunterfansub.com", "es"),
+            SingleLang("Ichirin No Hana Yuri", "https://ichirinnohanayuri.com.br", "pt-BR"),
+            SingleLang("Immortal Updates", "https://immortalupdates.com", "en"),
+            SingleLang("IsekaiScan.com", "https://isekaiscan.com", "en", className = "IsekaiScanCom"),
+            SingleLang("Its Your Right Manhua", "https://itsyourightmanhua.com/", "en"),
+            SingleLang("JJutsuScans", "https://jjutsuscans.com", "en"),
+            SingleLang("Just For Fun", "https://just-for-fun.ru", "ru"),
+            SingleLang("KingzManga", "https://kingzmanga.com", "ar"),
+            SingleLang("KisekiManga", "https://kisekimanga.com", "en"),
+            SingleLang("KlikManga", "https://klikmanga.com", "id"),
+            SingleLang("Kissmanga.in", "https://kissmanga.in", "en", className= "KissmangaIn"),
+            SingleLang("Kombatch", "https://kombatch.com", "id"),
+
+            SingleLang("Mangazuki.online", "http://mangazukinew.online", "en", className = "MangazukiOnline"),
     )
 
     companion object {

src/all/madara/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'Madara (multiple sources)'
     pkgNameSuffix = "all.madara"
     extClass = '.MadaraFactory'
-    extVersionCode = 179
+    extVersionCode = 180
     libVersion = '1.2'
     containsNsfw = true
 }

src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt

@@ -67,27 +67,26 @@ class MadaraFactory : SourceFactory {
 //        FurioScans(),
 //        GeceninLordu(),
 //        GoldenManga(),
-        GrazeScans(),
+//        GrazeScans(),
-        GourmetScans(),
+//        GourmetScans(),
 //        GuncelManga(),
 //        HeroManhua(),
 //        HerozScanlation(),
 //        HikariScan(),
 //        HimeraFansub(),
 //        Hiperdex(),
-        Hscans(),
+//        Hscans(),
-        HunterFansub(),
+//        HunterFansub(),
-        IchirinNoHanaYuri(),
+//        IchirinNoHanaYuri(),
-        ImmortalUpdates(),
+//        ImmortalUpdates(),
-        IsekaiScanCom(),
+//        IsekaiScanCom(),
-        ItsYourRightManhua(),
+//        ItsYourRightManhua(),
-        JJutsuScans(),
+//        JJutsuScans(),
-        JustForFun(),
+//        JustForFun(),
-        KingzManga(),
+//        KingzManga(),
-        KisekiManga(),
+//        KisekiManga(),
-        KlikManga(),
+//        KlikManga(),
-        KMangaIn(),
+//        Kombatch(),
-        Kombatch(),
         KomikGo(),
         LilyManga(),
         LovableSubs(),
@@ -142,7 +141,7 @@ class MadaraFactory : SourceFactory {
         MangazukiClubJP(),
         MangazukiClubKO(),
         MangazukiMe(),
-        MangazukiOnline(),
+//        MangazukiOnline(),
         ManhuaBox(),
         ManhuaFast(),
         Manhuaga(),
@@ -295,16 +294,12 @@ class NekoBreaker : Madara("NekoBreaker", "https://nekobreaker.com", "pt-BR", Si
 
 class ManganeloLink : Madara("Manganelo.link", "https://manganelo.link", "en")
 
-class KisekiManga : Madara("KisekiManga", "https://kisekimanga.com", "en")
-
 class MangaRoma : Madara("MangaRoma", "https://mangaroma.com", "en")
 
 class NTSVoidScans : Madara("NTS Void Scans", "https://ntsvoidscans.com", "en")
 
 class ToonGod : Madara("ToonGod", "https://www.toongod.com", "en", SimpleDateFormat("dd MMM yyyy", Locale.US))
 
-class Hscans : Madara("Hscans", "https://hscans.com", "en", SimpleDateFormat("MMMM dd, yyyy", Locale.forLanguageTag("es")))
-
 class WebToonily : Madara("WebToonily", "https://webtoonily.com", "en")
 
 class Manga18Fun : Madara("Manga18 Fun", "https://manga18.fun", "en")
@@ -348,14 +343,8 @@ class ReadManhua : Madara(
     dateFormat = SimpleDateFormat("dd MMM yy", Locale.US)
 )
 
-class IsekaiScanCom : Madara("IsekaiScan.com", "https://isekaiscan.com", "en")
 
-class JustForFun : Madara(
+
-    "Just For Fun",
-    "https://just-for-fun.ru",
-    "ru",
-    dateFormat = SimpleDateFormat("yy.MM.dd", Locale.US)
-)
 
 class KomikGo : Madara("KomikGo", "https://komikgo.com", "id")
 
@@ -377,10 +366,6 @@ class ZManga : Madara("ZManga", "https://zmanga.org", "es")
 
 class MangazukiMe : Madara("Mangazuki.me", "https://mangazuki.me", "en")
 
-class MangazukiOnline : Madara("Mangazuki.online", "https://www.mangazuki.online", "en") {
-    override val client: OkHttpClient = super.client.newBuilder().followRedirects(true).build()
-}
-
 class MangazukiClubJP : Madara("Mangazuki.club", "https://mangazuki.club", "ja")
 
 class MangazukiClubKO : Madara("Mangazuki.club", "https://mangazuki.club", "ko")
@@ -420,13 +405,8 @@ class Milftoon : Madara("Milftoon", "https://milftoon.xxx", "en") {
     override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/page/$page/?m_orderby=latest", headers)
 }
 
-class KMangaIn : Madara("Kissmanga.in", "https://kissmanga.in", "en")
 
-class HunterFansub : Madara("Hunter Fansub", "https://hunterfansub.com", "es") {
+
-    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/biblioteca/page/$page?m_orderby=views", headers)
-    override fun popularMangaNextPageSelector() = "div.nav-previous"
-    override val popularMangaUrlSelector = "div.post-title a:last-child"
-}
 
 class MangaArabOnline : Madara("Manga Arab Online مانجا عرب اون لاين", "https://mangaarabonline.com", "ar", SimpleDateFormat("MMM d, yyyy", Locale.forLanguageTag("ar")))
 
@@ -482,7 +462,6 @@ class Toonily : Madara("Toonily", "https://toonily.com", "en") {
 
 class MangaKomi : Madara("MangaKomi", "https://mangakomi.com", "en")
 
-class KingzManga : Madara("KingzManga", "https://kingzmanga.com", "ar")
 
 @Nsfw
 class YaoiToshokan : Madara("Yaoi Toshokan", "https://yaoitoshokan.com.br", "pt-BR", SimpleDateFormat("dd MMM yyyy", Locale("pt", "BR"))) {
@@ -516,7 +495,6 @@ class AstralLibrary : Madara("Astral Library", "https://www.astrallibrary.net",
     }
 }
 
-class KlikManga : Madara("KlikManga", "https://klikmanga.com", "id", SimpleDateFormat("MMMM dd, yyyy", Locale("id")))
 
 class MiracleScans : Madara("Miracle Scans", "https://miraclescans.com", "en")
 
@@ -530,7 +508,6 @@ class MangaAction : Madara("Manga Action", "https://manga-action.com", "ar", Sim
 
 class NijiTranslations : Madara("Niji Translations", "https://niji-translations.com", "ar", SimpleDateFormat("MMMM dd, yyyy", Locale("ar")))
 
-class IchirinNoHanaYuri : Madara("Ichirin No Hana Yuri", "https://ichirinnohanayuri.com.br", "pt-BR", SimpleDateFormat("dd/MM/yyyy", Locale("pt")))
 
 class LilyManga : Madara("Lily Manga", "https://lilymanga.com", "en", SimpleDateFormat("yyyy-MM-dd", Locale.US))
 
@@ -736,7 +713,6 @@ class Ninjavi : Madara("Ninjavi", "https://ninjavi.com", "ar")
 
 class ManhwaTop : Madara("Manhwatop", "https://manhwatop.com", "en")
 
-class ImmortalUpdates : Madara("Immortal Updates", "https://immortalupdates.com", "en")
 
 class Wakascan : Madara("Wakascan", "https://wakascan.com", "fr")
 
@@ -758,13 +734,10 @@ class MangaKiss : Madara("Manga Kiss", "https://mangakiss.org", "en")
 
 class MangaRocky : Madara("Manga Rocky", "https://mangarocky.com", "en")
 
-class JJutsuScans : Madara("JJutsuScans", "https://jjutsuscans.com", "en")
-
 class S2Manga : Madara("S2Manga", "https://s2manga.com", "en")
 
 class MangaLandArabic : Madara("Manga Land Arabic", "https://mangalandarabic.com", "ar")
 
-class Kombatch : Madara("Kombatch", "https://kombatch.com", "id", SimpleDateFormat("d MMMM yyyy", Locale.forLanguageTag("id")))
 
 class ProjetoScanlator : Madara("Projeto Scanlator", "https://projetoscanlator.com", "pt-BR", SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")))
 
@@ -862,7 +835,6 @@ class Voidscans : Madara("Void Scans", "https://voidscans.com", "en") {
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList) = GET("$baseUrl/?s=$query&post_type=wp-manga")
 }
 
-class GrazeScans : Madara("Graze Scans", "https://grazescans.com/", "en")
 
 class UyuyanBalik : Madara("Uyuyan Balik", "https://uyuyanbalik.com/", "tr", SimpleDateFormat("dd MMMM yyyy", Locale.US))
 
@@ -886,6 +858,4 @@ class MangaBin : Madara("Manga Bin", "https://mangabin.com/", "en")
 
 class MangaChill : Madara("Manga Chill", "https://mangachill.com/", "en")
 
-class GourmetScans : Madara("Gourmet Scans", "https://gourmetscans.net/", "en")
 
-class ItsYourRightManhua : Madara("Its Your Right Manhua", "https://itsyourightmanhua.com/", "en")