From 201aad33c8ce78e1a5fc882d12b4e1f0a570d022 Mon Sep 17 00:00:00 2001
From: Mike <51273546+SnakeDoc83@users.noreply.github.com>
Date: Tue, 21 Jul 2020 05:34:49 -0400
Subject: [PATCH] Madara - add Skymanga, remove Novel France (#3862)

---
 src/all/madara/build.gradle                       |  2 +-
 .../tachiyomi/extension/all/madara/Madara.kt      |  2 +-
 .../extension/all/madara/MadaraFactory.kt         | 15 +++++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle
index 19cbb74af..4f785f1ae 100644
--- a/src/all/madara/build.gradle
+++ b/src/all/madara/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Madara (multiple sources)'
     pkgNameSuffix = "all.madara"
     extClass = '.MadaraFactory'
-    extVersionCode = 120
+    extVersionCode = 121
     libVersion = '1.2'
 }
 
diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
index 904e598b2..1931ead79 100644
--- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
+++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
@@ -311,7 +311,7 @@ abstract class Madara(
         return manga
     }
 
-    override fun searchMangaNextPageSelector(): String? = "div.nav-previous, nav.navigation-ajax"
+    override fun searchMangaNextPageSelector(): String? = "div.nav-previous, nav.navigation-ajax, a.nextpostslink"
 
     // Manga Details Parse
 
diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
index a5a78efb4..7576d1ba3 100644
--- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
+++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
@@ -93,7 +93,6 @@ class MadaraFactory : SourceFactory {
         NightComic(),
         NijiTranslations(),
         NinjaScans(),
-        NovelFrance(),
         OnManga(),
         PMScans(),
         PojokManga(),
@@ -156,7 +155,8 @@ class MadaraFactory : SourceFactory {
         ManhuaPlus(),
         TritiniaScans(),
         AkuManga(),
-        AsgardTeam()
+        AsgardTeam(),
+        Skymanga()
         // Removed by request of site owner
         // EarlyManga(),
         // MangaGecesi(),
@@ -479,7 +479,6 @@ class Milftoon : Madara("Milftoon", "https://milftoon.xxx", "en") {
 }
 
 class Hiperdex : Madara("Hiperdex", "https://hiperdex.com", "en") {
-    override fun searchMangaNextPageSelector() = "${super.searchMangaNextPageSelector()}, a.nextpostslink"
     override fun getGenreList() = listOf(
         Genre("Adult", "adult"),
         Genre("Action", "action"),
@@ -721,8 +720,6 @@ class AstralLibrary : Madara("Astral Library", "https://astrallibrary.net", "en"
     override fun chapterListParse(response: Response): List<SChapter> = super.chapterListParse(response).reversed()
 }
 
-class NovelFrance : Madara("Novel France", "http://novel-france.fr", "fr", SimpleDateFormat("dd MMM yyyy", Locale.FRENCH))
-
 class KlikManga : Madara("KlikManga", "https://klikmanga.com", "id", SimpleDateFormat("MMMM dd, yyyy", Locale("id")))
 
 class MiracleScans : Madara("Miracle Scans", "https://miraclescans.com", "en")
@@ -1006,7 +1003,11 @@ class MartialScans : Madara("Martial Scans", "https://martialscans.com", "en") {
 
 class MangaYosh : Madara("MangaYosh", "https://mangayosh.xyz", "id", SimpleDateFormat("dd MMM yyyy", Locale.US))
 
-class WebtoonXYZ : Madara("WebtoonXYZ", "https://www.webtoon.xyz", "en")
+class WebtoonXYZ : Madara("WebtoonXYZ", "https://www.webtoon.xyz", "en") {
+    private fun pagePath(page: Int) = if (page > 1) "page/$page/" else ""
+    override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=views", headers)
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=latest", headers)
+}
 
 class ManhwaTime : Madara("ManhwaTime", "https://manhwatime.xyz", "en")
 
@@ -1198,3 +1199,5 @@ class ManhuaPlus : Madara("Manhua Plus", "https://manhuaplus.com", "en") {
 class AkuManga : Madara("AkuManga", "https://akumanga.com", "ar")
 
 class AsgardTeam : Madara("Asgard Team", "https://www.asgard1team.com", "ar")
+
+class Skymanga : Madara("Skymanga", "https://skymanga.co", "en")