Fix search, update URLs and change icon. (#1151)

src/pt/unionmangas/build.gradle

@@ -5,8 +5,13 @@ ext {
     appName = 'Tachiyomi: Union Mangás'
     pkgNameSuffix = 'pt.unionmangas'
     extClass = '.UnionMangas'
-    extVersionCode = 5
+    extVersionCode = 6
     libVersion = '1.2'
 }
 
+dependencies {
+    compileOnly 'com.google.code.gson:gson:2.8.2'
+    compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0'
+}
+
 apply from: "$rootDir/common.gradle"

src/pt/unionmangas/src/eu/kanade/tachiyomi/extension/pt/unionmangas/UnionMangas.kt

@@ -1,15 +1,15 @@
 package eu.kanade.tachiyomi.extension.pt.unionmangas
 
+import com.github.salomonbrys.kotson.array
+import com.github.salomonbrys.kotson.obj
+import com.github.salomonbrys.kotson.string
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.*
-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.FormBody
+import okhttp3.*
-import okhttp3.Headers
-import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import java.text.ParseException
@@ -35,100 +35,101 @@ class UnionMangas : ParsedHttpSource() {
                     .writeTimeout(3, TimeUnit.MINUTES)
                     .build()
 
-    private val catalogHeaders = Headers.Builder().apply {
+    private val catalogHeaders = Headers.Builder()
-        add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; WOW64)")
+            .apply {
-        add("Host", "unionmangas.top")
+                add("User-Agent", USER_AGENT)
-        add("Referer", baseUrl)
+                add("Origin", baseUrl)
-    }.build()
+                add("Referer", "$baseUrl/ini")
-
+            }
-    override fun popularMangaSelector(): String = "div.bloco-manga"
+            .build()
 
     override fun popularMangaRequest(page: Int): Request {
         val pageStr = if (page != 1) "/$page" else ""
-        return GET("$baseUrl/mangas/visualizacoes$pageStr", catalogHeaders)
+        return GET("$baseUrl/lista-mangas/visualizacoes$pageStr", catalogHeaders)
     }
 
-    override fun popularMangaFromElement(element: Element): SManga {
+    override fun popularMangaSelector(): String = "div.bloco-manga"
-        val manga = SManga.create()
-        manga.thumbnail_url = element.select("a img").first()?.attr("src")
-        element.select("a").last().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text().replace(LANG_REGEX.toRegex(), "")
-        }
 
-        return manga
+    override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply {
+        title = removeLanguage(element.select("a").last().text())
+        thumbnail_url = element.select("a img").first()?.attr("src")
+        setUrlWithoutDomain(element.select("a").last().attr("href"))
     }
 
     override fun popularMangaNextPageSelector() = ".pagination li:contains(Next)"
 
+    override fun latestUpdatesRequest(page: Int): Request {
+        val form = FormBody.Builder()
+                .add("pagina", page.toString())
+                .build()
+
+        val newHeaders = catalogHeaders.newBuilder()
+                .set("X-Requested-With", "XMLHttpRequest")
+                .build()
+
+        return POST("$baseUrl/assets/noticias.php", newHeaders, form)
+    }
+
     override fun latestUpdatesSelector() = "div.row[style] div.col-md-12[style]"
 
-    override fun latestUpdatesRequest(page: Int): Request {
-        val form = FormBody.Builder().apply {
-            add("pagina", page.toString())
-        }
-
-        return POST("$baseUrl/assets/noticias.php", headers, form.build())
-    }
-
     override fun latestUpdatesFromElement(element: Element): SManga {
-        // return popularMangaFromElement(element)
+        val infoElement = element.select("a.link-titulo")
-        val manga = SManga.create()
-        val infoElements = element.select("a.link-titulo")
-        manga.thumbnail_url = infoElements.first()?.select("img")?.attr("src")
-        infoElements.last().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text().replace(LANG_REGEX.toRegex(), "")
-        }
 
-        return manga
+        return SManga.create().apply {
+            title = removeLanguage(infoElement.last().text())
+            thumbnail_url = infoElement.first()?.select("img")?.attr("src")
+            setUrlWithoutDomain(infoElement.last().attr("href"))
+        }
     }
 
     override fun latestUpdatesNextPageSelector() = "div#linha-botao-mais"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        return GET("$baseUrl/busca/$query/$page", headers)
+        val newHeaders = catalogHeaders.newBuilder()
+                .set("X-Requested-With", "XMLHttpRequest")
+                .build()
+
+        val url = HttpUrl.parse("$baseUrl/assets/busca.php")!!.newBuilder()
+                .addQueryParameter("q", query)
+
+        return GET(url.toString(), newHeaders)
     }
 
-    override fun searchMangaSelector() = ".bloco-manga"
+    override fun searchMangaParse(response: Response): MangasPage {
+        val result = response.asJsonObject()
 
-    override fun searchMangaFromElement(element: Element): SManga {
+        val mangas = result["items"].array.map { searchMangaFromObject(it.obj) }
-        val manga = SManga.create()
+
-        val thumbnailElement = element.select("a img.img-thumbnail").first()
+        return MangasPage(mangas, false)
-        manga.thumbnail_url = thumbnailElement.attr("src").replace("com.br", "top")
-        element.select("a").last().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text().replace(LANG_REGEX.toRegex(), "")
     }
 
-        return manga
+    private fun searchMangaFromObject(obj: JsonObject): SManga = SManga.create().apply {
+        title = obj["titulo"].string
+        thumbnail_url = obj["imagem"].string
+        setUrlWithoutDomain("$baseUrl/manga/${obj["url"].string}")
     }
 
-    override fun searchMangaNextPageSelector() = "ul.pagination li:not(.active)"
+    override fun mangaDetailsRequest(manga: SManga): Request = GET(baseUrl + manga.url, catalogHeaders)
 
     override fun mangaDetailsParse(document: Document): SManga {
         val infoElement = document.select("div.tamanho-bloco-perfil").first()
+        val elAuthor = infoElement.select("div.row:eq(2) div.col-md-8:eq(4)").first()
+        val elArtist = infoElement.select("div.row:eq(2) div.col-md-8:eq(5)").first()
+        val elGenre = infoElement.select("div.row:eq(2) div.col-md-8:eq(3)").first()
+        val elStatus =  infoElement.select("div.row:eq(2) div.col-md-8:eq(6)").first()
+        val elDescription = infoElement.select("div.row:eq(2) div.col-md-8:eq(8)").first()
+        val imgThumbnail = infoElement.select(".img-thumbnail").first()
+        val elTitle = infoElement.select("h2").first()
 
-        val manga = SManga.create()
+        return SManga.create().apply {
-
+            title = removeLanguage(elTitle!!.text())
-        val author = infoElement.select("div.row:eq(2) div.col-md-8:eq(4)").first()?.text()
+            author = removeLabel(elAuthor?.text())
-        manga.author = removeLabel(author)
+            artist = removeLabel(elArtist?.text())
-
+            genre = removeLabel(elGenre?.text())
-        val artist = infoElement.select("div.row:eq(2) div.col-md-8:eq(5)").first()?.text()
+            status = parseStatus(elStatus?.text().orEmpty())
-        manga.artist = removeLabel(artist)
+            description = elDescription?.text()
-
+            thumbnail_url = imgThumbnail?.attr("src")
-        val genre = infoElement.select("div.row:eq(2) div.col-md-8:eq(3)").first()?.text()
+        }
-        manga.genre = removeLabel(genre)
-
-        manga.status = infoElement.select("div.row:eq(2) div.col-md-8:eq(6)").first()?.text().orEmpty().let { parseStatus(it) }
-
-        manga.description = infoElement.select("div.row:eq(2) div.col-md-8:eq(8)").first()?.text()
-        manga.thumbnail_url = infoElement.select(".img-thumbnail").first()?.attr("src")
-
-        // Need to grab title again because the ellipsize in search.
-        manga.title = infoElement.select("h2").first()!!.text().replace(LANG_REGEX.toRegex(), "")
-
-        return manga
     }
 
     private fun parseStatus(status: String) = when {
@@ -137,9 +138,7 @@ class UnionMangas : ParsedHttpSource() {
         else -> SManga.UNKNOWN
     }
 
-    private fun removeLabel(text: String?): String {
+    override fun chapterListRequest(manga: SManga): Request = GET(baseUrl + manga.url, catalogHeaders)
-        return text!!.substring(text.indexOf(":") + 1)
-    }
 
     override fun chapterListSelector() = "div.row.lancamento-linha"
 
@@ -147,22 +146,15 @@ class UnionMangas : ParsedHttpSource() {
         val firstColumn = element.select("div.col-md-6:eq(0)")
         val secondColumn = element.select("div.col-md-6:eq(1)")
 
-        val chapter = SChapter.create()
+        return SChapter.create().apply {
-        chapter.setUrlWithoutDomain(firstColumn.select("a").first().attr("href"))
+            name = firstColumn.select("a").first().text()
-        chapter.name = firstColumn.select("a").first().text()
+            scanlator = secondColumn?.text()
-        chapter.date_upload = firstColumn.select("span").last()?.text()?.let { parseChapterDate(it) } ?: 0
+            date_upload = parseChapterDate(firstColumn.select("span").last()!!.text())
-        chapter.scanlator = secondColumn?.text()
+            setUrlWithoutDomain(firstColumn.select("a").first().attr("href"))
-
+        }
-        return chapter
     }
 
-    private fun parseChapterDate(date: String) : Long {
+    override fun pageListRequest(chapter: SChapter): Request = GET(baseUrl + chapter.url, catalogHeaders)
-        return try {
-            SimpleDateFormat("(dd/MM/yyyy)", Locale.ENGLISH).parse(date).time
-        } catch (e: ParseException) {
-            0L
-        }
-    }
 
     override fun pageListParse(document: Document): List<Page> {
         val pages = document.select("img.img-responsive.img-manga")
@@ -174,7 +166,28 @@ class UnionMangas : ParsedHttpSource() {
 
     override fun imageUrlParse(document: Document) = ""
 
+    override fun searchMangaSelector() = throw Exception("This method should not be called!")
+
+    override fun searchMangaFromElement(element: Element): SManga = throw Exception("This method should not be called!")
+
+    override fun searchMangaNextPageSelector() = throw Exception("This method should not be called!")
+
+    private fun removeLanguage(text: String): String = text.replace("(Pt-Br)", "", true).trim()
+
+    private fun removeLabel(text: String?): String = text!!.substringAfter(":").trim()
+
+    private fun parseChapterDate(date: String) : Long {
+        return try {
+            SimpleDateFormat("(dd/MM/yyyy)", Locale.ENGLISH).parse(date).time
+        } catch (e: ParseException) {
+            0L
+        }
+    }
+
+    private fun Response.asJsonObject(): JsonObject = JSON_PARSER.parse(body()!!.string()).obj
+
     companion object {
-        private const val LANG_REGEX = "( )?\\(Pt-Br\\)"
+        private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.92 Safari/537.36"
+        private val JSON_PARSER by lazy { JsonParser() }
     }
 }