From c6e81d778f34bd9099e69c8e4556e635ea052462 Mon Sep 17 00:00:00 2001
From: Vetle Ledaal <vetle.ledaal@gmail.com>
Date: Mon, 31 Jan 2022 12:10:32 +0000
Subject: [PATCH] re-manga: Fix latest, chapter parsing (#10630)

* re-manga: Fix latest, chapter parsing

minor refactor

* make SimpleDateFormat static
---
 src/ar/remanga/build.gradle                   |  2 +-
 .../tachiyomi/extension/ar/remanga/REManga.kt | 58 ++++++++++++-------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/ar/remanga/build.gradle b/src/ar/remanga/build.gradle
index 5ee26f398..289552a32 100644
--- a/src/ar/remanga/build.gradle
+++ b/src/ar/remanga/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'RE Manga'
     pkgNameSuffix = 'ar.remanga'
     extClass = '.REManga'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/remanga/src/eu/kanade/tachiyomi/extension/ar/remanga/REManga.kt b/src/ar/remanga/src/eu/kanade/tachiyomi/extension/ar/remanga/REManga.kt
index ef6bcf7c9..cc5b832e8 100644
--- a/src/ar/remanga/src/eu/kanade/tachiyomi/extension/ar/remanga/REManga.kt
+++ b/src/ar/remanga/src/eu/kanade/tachiyomi/extension/ar/remanga/REManga.kt
@@ -7,10 +7,12 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.ParsedHttpSource
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
+import java.text.SimpleDateFormat
+import java.util.Locale
 
 class REManga : ParsedHttpSource() {
 
@@ -24,40 +26,38 @@ class REManga : ParsedHttpSource() {
 
     // Popular
 
-    override fun popularMangaRequest(page: Int): Request {
-        return GET("$baseUrl/manga-list/")
-    }
+    override fun popularMangaRequest(page: Int): Request =
+        GET("$baseUrl/manga-list/?title=&order=popular&status=&type=")
 
     override fun popularMangaSelector() = "article.animpost"
 
-    override fun popularMangaFromElement(element: Element): SManga {
-        return SManga.create().apply {
-            element.select("a").let {
-                setUrlWithoutDomain(it.attr("href"))
-                thumbnail_url = element.select("img").attr("abs:src")
-                title = element.select("img").attr("title")
+    override fun popularMangaFromElement(element: Element): SManga =
+        SManga.create().apply {
+            setUrlWithoutDomain(element.select("a").attr("abs:href"))
+            element.select("img").let {
+                thumbnail_url = it.attr("abs:src")
+                title = it.attr("title")
             }
         }
-    }
 
     override fun popularMangaNextPageSelector(): String? = null
 
     // Latest
 
-    override fun latestUpdatesRequest(page: Int): Request {
-        return GET(baseUrl)
-    }
+    override fun latestUpdatesRequest(page: Int): Request =
+        GET("$baseUrl/manga-list/?title=&order=update&status=&type=")
 
     override fun latestUpdatesSelector() = popularMangaSelector()
 
     override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element)
 
-    override fun latestUpdatesNextPageSelector(): String? = null
+    override fun latestUpdatesNextPageSelector(): String? = popularMangaNextPageSelector()
 
     // Search
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = "$baseUrl/manga-list/?title=$query".toHttpUrlOrNull()!!.newBuilder()
+        val url = "$baseUrl/manga-list/?".toHttpUrl().newBuilder()
+            .addQueryParameter("title", query)
         filters.forEach { filter ->
             when (filter) {
                 is SortFilter -> url.addQueryParameter("order", filter.toUriPart())
@@ -77,9 +77,10 @@ class REManga : ParsedHttpSource() {
                         .filter { it.state != Filter.TriState.STATE_IGNORE }
                         .forEach { url.addQueryParameter("years[]", it.id) }
                 }
+                else -> {}
             }
         }
-        return GET(url.build().toString(), headers)
+        return GET(url.toString(), headers)
     }
 
     override fun searchMangaSelector() = popularMangaSelector()
@@ -108,12 +109,23 @@ class REManga : ParsedHttpSource() {
 
     // Chapters
 
-    override fun chapterListSelector() = "li"
+    override fun chapterListSelector() = ".lsteps li"
 
     override fun chapterFromElement(element: Element): SChapter {
         return SChapter.create().apply {
-            name = element.select("div.epsright span.eps > a > chapter").text()
-            setUrlWithoutDomain(element.select("div.epsright span.eps a").attr("abs:href"))
+            setUrlWithoutDomain(element.select("a").first()!!.attr("abs:href"))
+
+            val chNum = element.select(".eps > a").first()!!.text()
+            val chTitle = element.select(".lchx > a").first()!!.text()
+
+            name = when {
+                chTitle.startsWith("الفصل ") -> chTitle
+                else -> "الفصل $chNum - $chTitle"
+            }
+
+            element.select(".date").first()?.text()?.let { date ->
+                date_upload = DATE_FORMATTER.parse(date)?.time ?: 0L
+            }
         }
     }
 
@@ -237,4 +249,10 @@ class REManga : ParsedHttpSource() {
         Filter.Select<String>(displayName, vals.map { it.second }.toTypedArray()) {
         fun toUriPart() = vals[state].first
     }
+
+    companion object {
+        private val DATE_FORMATTER by lazy {
+            SimpleDateFormat("MMM d, yyy", Locale("ar"))
+        }
+    }
 }