From ace0dbf5d2b5d899e083325d4138eb16a826e756 Mon Sep 17 00:00:00 2001
From: Edgard Lorraine Messias <edgardmessias@gmail.com>
Date: Mon, 29 Jan 2024 09:54:04 -0300
Subject: [PATCH] fix(pt/goanimes): Fix extractor and quality name (#2840)

Co-authored-by: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
---
 .../dooplay/goanimes/src/GoAnimes.kt          | 40 ++++++++++++++++---
 .../src/extractors/GoAnimesExtractor.kt       | 10 ++---
 .../multisrc/dooplay/DooPlayGenerator.kt      |  2 +-
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt b/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt
index 620fcf169..4a5c489e1 100644
--- a/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt
+++ b/multisrc/overrides/dooplay/goanimes/src/GoAnimes.kt
@@ -8,6 +8,7 @@ import eu.kanade.tachiyomi.animeextension.pt.goanimes.extractors.PlaylistExtract
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.await
@@ -70,6 +71,7 @@ class GoAnimes : DooPlay(
     private val goanimesExtractor by lazy { GoAnimesExtractor(client, headers) }
     private val bloggerExtractor by lazy { BloggerExtractor(client) }
     private val linkfunBypasser by lazy { LinkfunBypasser(client) }
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.use { it.asJsoup() }
@@ -78,9 +80,13 @@ class GoAnimes : DooPlay(
     }
 
     private suspend fun getPlayerVideos(player: Element): List<Video> {
+        val name = player.selectFirst("span.title")!!.text()
+            .replace("FULLHD", "1080p")
+            .replace("HD", "720p")
+            .replace("SD", "480p")
         val url = getPlayerUrl(player)
         return when {
-            "player5.goanimes.net" in url -> goanimesExtractor.videosFromUrl(url)
+            "player5.goanimes.net" in url -> goanimesExtractor.videosFromUrl(url, name)
             "https://gojopoolt" in url -> {
                 val headers = headers.newBuilder()
                     .set("referer", url)
@@ -88,7 +94,7 @@ class GoAnimes : DooPlay(
 
                 val script = client.newCall(GET(url, headers)).await()
                     .use { it.body.string() }
-                    .let { JsDecoder.decodeScript(it, false) }
+                    .let { JsDecoder.decodeScript(it, false).ifBlank { it } }
 
                 script.substringAfter("sources: [")
                     .substringBefore(']')
@@ -103,9 +109,21 @@ class GoAnimes : DooPlay(
                         val resolution = it.substringAfter("label: ", "")
                             .substringAfter('"')
                             .substringBefore('"')
-                            .ifBlank { "Default" }
+                            .ifBlank { name.split('-').last().trim() }
 
-                        Video(videoUrl, "Gojopoolt - $resolution", videoUrl, headers)
+                        val partialName = name.split('-').first().trim()
+                        return when {
+                            videoUrl.contains(".m3u8") -> {
+                                playlistUtils.extractFromHls(
+                                    videoUrl,
+                                    url,
+                                    videoNameGen = {
+                                        "$partialName - ${it.replace("Video", resolution)}"
+                                    },
+                                )
+                            }
+                            else -> listOf(Video(videoUrl, "$partialName - $resolution", videoUrl, headers))
+                        }
                     }
             }
             listOf("/bloggerjwplayer", "/m3u8", "/multivideo").any { it in url } -> {
@@ -121,7 +139,8 @@ class GoAnimes : DooPlay(
                         script.substringAfter("attr")
                             .substringAfter(" \"")
                             .substringBefore('"')
-                            .let(goanimesExtractor::videosFromUrl)
+                            .let { goanimesExtractor.videosFromUrl(it, name) }
+
                     else -> emptyList<Video>()
                 }
             }
@@ -153,4 +172,15 @@ class GoAnimes : DooPlay(
             else -> url
         }
     }
+    // ============================= Utilities ==============================
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(videoSortPrefKey, videoSortPrefDefault)!!
+        return sortedWith(
+            compareBy(
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
 }
diff --git a/multisrc/overrides/dooplay/goanimes/src/extractors/GoAnimesExtractor.kt b/multisrc/overrides/dooplay/goanimes/src/extractors/GoAnimesExtractor.kt
index 6f4a3a2f2..3bc0b071a 100644
--- a/multisrc/overrides/dooplay/goanimes/src/extractors/GoAnimesExtractor.kt
+++ b/multisrc/overrides/dooplay/goanimes/src/extractors/GoAnimesExtractor.kt
@@ -12,12 +12,12 @@ import okhttp3.OkHttpClient
 class GoAnimesExtractor(private val client: OkHttpClient, private val headers: Headers) {
     private val playlistUtils by lazy { PlaylistUtils(client, headers) }
 
-    fun videosFromUrl(url: String): List<Video> {
+    fun videosFromUrl(url: String, name: String): List<Video> {
         val body = client.newCall(GET(url, headers)).execute()
             .use { it.body.string() }
         return when {
-            "/profix/player.php" in url ->
-                PlaylistExtractor.videosFromScript(body, PLAYER_NAME)
+            "better-go.fun/player.php" in url || "/profix/player.php" in url ->
+                PlaylistExtractor.videosFromScript(body, name.split('-').first().trim())
             "/proxy/v.php" in url -> {
                 val playlistUrl = JsUnpacker.unpackAndCombine(body)
                     ?.substringAfterLast("player(\\'", "")
@@ -25,7 +25,7 @@ class GoAnimesExtractor(private val client: OkHttpClient, private val headers: H
                     ?.takeIf(String::isNotEmpty)
                     ?: return emptyList()
 
-                playlistUtils.extractFromHls(playlistUrl, url, videoNameGen = { "$PLAYER_NAME - $it" })
+                playlistUtils.extractFromHls(playlistUrl, url, videoNameGen = { "$name - $it" })
             }
             "/proxy/api3/" in url -> {
                 val playlistUrl = body.substringAfter("sources:", "")
@@ -43,7 +43,7 @@ class GoAnimesExtractor(private val client: OkHttpClient, private val headers: H
                 }
 
                 val referer = url.toHttpUrl().queryParameter("url") ?: url
-                playlistUtils.extractFromHls(fixedUrl, referer, videoNameGen = { "$PLAYER_NAME - $it" })
+                playlistUtils.extractFromHls(fixedUrl, referer, videoNameGen = { "$name - $it" })
             }
             else -> emptyList()
         }
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt
index 62e1f57f3..8a075c0ff 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/dooplay/DooPlayGenerator.kt
@@ -18,7 +18,7 @@ class DooPlayGenerator : ThemeSourceGenerator {
         SingleLang("AnimesFox BR", "https://animesfox.net", "pt-BR", isNsfw = false, overrideVersionCode = 2),
         SingleLang("Animes House", "https://animeshouse.net", "pt-BR", isNsfw = false, overrideVersionCode = 9),
         SingleLang("Cinemathek", "https://cinemathek.net", "de", isNsfw = true, overrideVersionCode = 18),
-        SingleLang("GoAnimes", "https://goanimes.net", "pt-BR", isNsfw = true, overrideVersionCode = 8),
+        SingleLang("GoAnimes", "https://goanimes.net", "pt-BR", isNsfw = true, overrideVersionCode = 9),
         SingleLang("JetAnime", "https://ssl.jetanimes.com", "fr", isNsfw = false, overrideVersionCode = 3),
         SingleLang("Kinoking", "https://kinoking.cc", "de", isNsfw = false, overrideVersionCode = 19),
         SingleLang("Multimovies", "https://multimovies.live", "en", isNsfw = false, overrideVersionCode = 14),