From d06c9a3d67f586f110cbb3e94b717a6910bc0ae6 Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Sat, 11 Sep 2021 21:37:26 +0430
Subject: [PATCH] fix Mangas Origines  (#9034)

* fix manga name

* fix chapter list being empty, fix manga status being wrong

* update version code
---
 .../mangasorigines/src/MangasOrigines.kt      | 86 ++++++++++++++++++-
 .../multisrc/madara/MadaraGenerator.kt        |  2 +-
 2 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt b/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt
index b4fd221b3..8def2480e 100644
--- a/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt
+++ b/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt
@@ -1,7 +1,91 @@
 package eu.kanade.tachiyomi.extension.fr.mangasorigines
 
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.source.model.SManga
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class MangasOrigines : Madara("Mangas Origines", "https://mangas-origines.fr", "fr", SimpleDateFormat("dd MMM yyyy", Locale("fr")))
+class MangasOrigines : Madara("Mangas Origines", "https://mangas-origines.fr", "fr", SimpleDateFormat("dd MMM yyyy", Locale("fr"))) {
+    override val useNewChapterEndpoint = true
+
+    private fun String.removeFireEmoji() = this.substringAfter("\uD83D\uDD25 ")
+
+    override fun popularMangaFromElement(element: Element): SManga {
+        return super.popularMangaFromElement(element).apply {
+            title = title.removeFireEmoji()
+        }
+    }
+
+    override fun mangaDetailsParse(document: Document): SManga {
+        val manga = SManga.create()
+        with(document) {
+            select("div.post-title h1").first()?.let {
+                manga.title = it.ownText().removeFireEmoji()
+            }
+            select("div.author-content > a").eachText().filter {
+                it.notUpdating()
+            }.joinToString().takeIf { it.isNotBlank() }?.let {
+                manga.author = it
+            }
+            select("div.artist-content > a").eachText().filter {
+                it.notUpdating()
+            }.joinToString().takeIf { it.isNotBlank() }?.let {
+                manga.artist = it
+            }
+            select("div.description-summary div.summary__content").let {
+                if (it.select("p").text().isNotEmpty()) {
+                    manga.description = it.select("p").joinToString(separator = "\n\n") { p ->
+                        p.text().replace("<br>", "\n")
+                    }
+                } else {
+                    manga.description = it.text()
+                }
+            }
+            select("div.summary_image img").first()?.let {
+                manga.thumbnail_url = imageFromElement(it)
+            }
+            select("div.summary-content").last()?.let {
+                manga.status = when (it.text()) {
+                    // I don't know what's the corresponding for COMPLETED and LICENSED
+                    // There's no support for "Canceled" or "On Hold"
+                    "Terminé ⚫" -> SManga.COMPLETED
+                    "En cours \uD83D\uDFE2" -> SManga.ONGOING
+                    else -> SManga.UNKNOWN
+                }
+            }
+            val genres = select("div.genres-content a")
+                    .map { element -> element.text().toLowerCase(Locale.ROOT) }
+                    .toMutableSet()
+
+            // add tag(s) to genre
+            select("div.tags-content a").forEach { element ->
+                if (genres.contains(element.text()).not()) {
+                    genres.add(element.text().toLowerCase(Locale.ROOT))
+                }
+            }
+
+            // add manga/manhwa/manhua thinggy to genre
+            document.select(seriesTypeSelector).firstOrNull()?.ownText()?.let {
+                if (it.isEmpty().not() && it.notUpdating() && it != "-" && genres.contains(it).not()) {
+                    genres.add(it.toLowerCase(Locale.ROOT))
+                }
+            }
+
+            manga.genre = genres.toList().joinToString(", ") { it.capitalize(Locale.ROOT) }
+
+            // add alternative name to manga description
+            document.select(altNameSelector).firstOrNull()?.ownText()?.let {
+                if (it.isBlank().not() && it.notUpdating()) {
+                    manga.description = when {
+                        manga.description.isNullOrBlank() -> altName + it
+                        else -> manga.description + "\n\n$altName" + it
+                    }
+                }
+            }
+        }
+
+        return manga
+    }
+}
\ No newline at end of file
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
index 65c5a3cd4..813051d6e 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
@@ -243,7 +243,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("MangaYami", "https://www.mangayami.club", "en", overrideVersionCode = 2),
         SingleLang("Mangaka3rb", "https://mangaka3rb.com", "ar"),
         SingleLang("Mangakik", "https://mangakik.com", "en"),
-        SingleLang("Mangas Origines", "https://mangas-origines.fr", "fr", true, overrideVersionCode = 1),
+        SingleLang("Mangas Origines", "https://mangas-origines.fr", "fr", true, overrideVersionCode = 2),
         SingleLang("Mangasushi", "https://mangasushi.net", "en", overrideVersionCode = 2),
         SingleLang("Mangauptocats", "https://mangauptocats.online", "th", overrideVersionCode = 1),
         SingleLang("Mangazuki.me", "https://mangazuki.me", "en", className = "MangazukiMe", overrideVersionCode = 1),