From 5bad39943e6502d7f2aa75d2b36c745bb8e38ca6 Mon Sep 17 00:00:00 2001
From: happywillow0 <45346080+happywillow0@users.noreply.github.com>
Date: Mon, 23 Mar 2020 15:33:49 -0400
Subject: [PATCH] MangaAE - Fix Chapter URL (#2485)

MangaAE - Fix Chapter URL
---
 src/ar/mangaae/build.gradle                   |  2 +-
 .../tachiyomi/extension/ar/mangaae/MangaAe.kt | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/ar/mangaae/build.gradle b/src/ar/mangaae/build.gradle
index 10102e11d..a186b1242 100644
--- a/src/ar/mangaae/build.gradle
+++ b/src/ar/mangaae/build.gradle
@@ -5,7 +5,7 @@ ext {
     appName = 'Tachiyomi: Manga.ae'
     pkgNameSuffix = 'ar.mangaae'
     extClass = '.MangaAe'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '1.2'
 }
 
diff --git a/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt b/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt
index 851557cf0..57a1df37f 100644
--- a/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt
+++ b/src/ar/mangaae/src/eu/kanade/tachiyomi/extension/ar/mangaae/MangaAe.kt
@@ -2,7 +2,11 @@ package eu.kanade.tachiyomi.extension.ar.mangaae
 
 import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.source.model.*
+import eu.kanade.tachiyomi.source.model.Filter
+import eu.kanade.tachiyomi.source.model.FilterList
+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.Headers
 import okhttp3.HttpUrl
@@ -42,7 +46,11 @@ class MangaAe : ParsedHttpSource() {
 
     override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply {
         val lazysrc = element.select("img").attr("data-pagespeed-lazy-src")
-        thumbnail_url = if (lazysrc.isNullOrEmpty()) { element.select("img").attr("src") } else { lazysrc }
+        thumbnail_url = if (lazysrc.isNullOrEmpty()) {
+            element.select("img").attr("src")
+        } else {
+            lazysrc
+        }
         element.select("div.mangacontainer a.manga")[0].let {
             title = it.text()
             setUrlWithoutDomain(it.attr("abs:href"))
@@ -58,7 +66,11 @@ class MangaAe : ParsedHttpSource() {
 
     override fun latestUpdatesFromElement(element: Element): SManga = SManga.create().apply {
         val lazysrc = element.select("img").attr("data-pagespeed-lazy-src")
-        thumbnail_url = if (lazysrc.isNullOrEmpty()) { element.select("img").attr("src") } else { lazysrc }
+        thumbnail_url = if (lazysrc.isNullOrEmpty()) {
+            element.select("img").attr("src")
+        } else {
+            lazysrc
+        }
         element.select("a")[2].let {
             setUrlWithoutDomain(it.attr("abs:href"))
             title = it.text()
@@ -73,7 +85,7 @@ class MangaAe : ParsedHttpSource() {
         filters.forEach { filter ->
             when (filter) {
                 is OrderByFilter -> {
-                    if(filter.state != 0) {
+                    if (filter.state != 0) {
                         url += "|order:${filter.toUriPart()}"
                     }
                 }
@@ -92,7 +104,7 @@ class MangaAe : ParsedHttpSource() {
     // Manga summary page
     override fun mangaDetailsParse(document: Document): SManga = SManga.create().apply {
         val infoElement = document.select("div.indexcontainer").first()
-        title = infoElement.select("h1.EnglishName").text().removeSurrounding("(",")")
+        title = infoElement.select("h1.EnglishName").text().removeSurrounding("(", ")")
         author = infoElement.select("div.manga-details-author h4")[0].text()
         artist = author
         status = parseStatus(infoElement.select("div.manga-details-extended h4")[1].text())
@@ -115,8 +127,7 @@ class MangaAe : ParsedHttpSource() {
         val chapter = SChapter.create()
         element.select("a").let {
             // use full pages for easier links
-            chapter.setUrlWithoutDomain(it.attr("href")
-                .replace("/1/", "/0/full"))
+            chapter.setUrlWithoutDomain(it.attr("href").removeSuffix("/1/") + "/0/full")
             chapter.name = "\u061C" + it.text() //Add unicode ARABIC LETTER MARK to ensure all titles are right to left
         }
         return chapter
@@ -130,7 +141,8 @@ class MangaAe : ParsedHttpSource() {
         }
         return pages
     }
-    override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")
+
+    override fun imageUrlParse(document: Document): String = throw Exception("Not used")
 
     private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
         Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {