From 9fbe1353589ddcd4180639d8abe52f926b56f1a9 Mon Sep 17 00:00:00 2001
From: Dark25 <nadiecaca2000@gmail.com>
Date: Sun, 18 Aug 2024 23:07:24 +0100
Subject: [PATCH] Feat(all/Hikari): identify Sub or Dub (#156)

---
 src/all/hikari/build.gradle                   |  2 +-
 .../animeextension/all/hikari/Hikari.kt       | 60 ++++++++++++++++---
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/src/all/hikari/build.gradle b/src/all/hikari/build.gradle
index 0c173c79..c97c3cbb 100644
--- a/src/all/hikari/build.gradle
+++ b/src/all/hikari/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hikari'
     extClass = '.Hikari'
-    extVersionCode = 5
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt
index 3963eb9c..325bbcb2 100644
--- a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt
+++ b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.all.hikari
 
 import android.app.Application
+import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -233,24 +234,69 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     override fun videoListParse(response: Response): List<Video> {
         val html = response.parseAs<HtmlResponseDto>().toHtml(baseUrl)
+        Log.d("Hikari", html.toString())
 
         val headers = headersBuilder()
             .set("Referer", response.request.url.toString())
             .build()
 
-        val embedUrls = html.select(videoListSelector()).flatMap {
-            val name = it.text()
-            val onClick = it.selectFirst("a")!!.attr("onclick")
-            val match = embedRegex.find(onClick)!!.groupValues
+        val subEmbedUrls = html.select(".servers-sub div.item.server-item").flatMap { item ->
+            val name = item.text().trim() + " (Sub)"
+            val onClick = item.selectFirst("a")?.attr("onclick")
+            if (onClick == null) {
+                Log.e("Hikari", "onClick attribute is null for item: $item")
+                return@flatMap emptyList<Pair<String, String>>()
+            }
+
+            val match = embedRegex.find(onClick)?.groupValues
+            if (match == null) {
+                Log.e("Hikari", "No match found for onClick: $onClick")
+                return@flatMap emptyList<Pair<String, String>>()
+            }
+
             val url = "$baseUrl/ajax/embed/${match[1]}/${match[2]}/${match[3]}"
             val iframeList = client.newCall(
                 GET(url, headers),
             ).execute().parseAs<List<String>>()
 
             iframeList.map {
-                Pair(Jsoup.parseBodyFragment(it).selectFirst("iframe")!!.attr("src"), name)
-            }
+                val iframeSrc = Jsoup.parseBodyFragment(it).selectFirst("iframe")?.attr("src")
+                if (iframeSrc == null) {
+                    Log.e("Hikari", "iframe src is null for URL: $url")
+                    return@map Pair("", "")
+                }
+                Pair(iframeSrc, name)
+            }.filter { it.first.isNotEmpty() }
         }
+        val dubEmbedUrls = html.select(".servers-dub div.item.server-item").flatMap { item ->
+            val name = item.text().trim() + " (Dub)"
+            val onClick = item.selectFirst("a")?.attr("onclick")
+            if (onClick == null) {
+                Log.e("Hikari", "onClick attribute is null for item: $item")
+                return@flatMap emptyList<Pair<String, String>>()
+            }
+
+            val match = embedRegex.find(onClick)?.groupValues
+            if (match == null) {
+                Log.e("Hikari", "No match found for onClick: $onClick")
+                return@flatMap emptyList<Pair<String, String>>()
+            }
+
+            val url = "$baseUrl/ajax/embed/${match[1]}/${match[2]}/${match[3]}"
+            val iframeList = client.newCall(
+                GET(url, headers),
+            ).execute().parseAs<List<String>>()
+
+            iframeList.map {
+                val iframeSrc = Jsoup.parseBodyFragment(it).selectFirst("iframe")?.attr("src")
+                if (iframeSrc == null) {
+                    Log.e("Hikari", "iframe src is null for URL: $url")
+                    return@map Pair("", "")
+                }
+                Pair(iframeSrc, name)
+            }.filter { it.first.isNotEmpty() }
+        }
+        val embedUrls = subEmbedUrls + dubEmbedUrls
 
         return embedUrls.parallelCatchingFlatMapBlocking {
             getVideosFromEmbed(it.first, it.second)
@@ -258,7 +304,7 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     }
 
     private fun getVideosFromEmbed(embedUrl: String, name: String): List<Video> = when {
-        name.contains("vidhide", true) -> vidHideExtractor.videosFromUrl(embedUrl)
+        name.contains("vidhide", true) -> vidHideExtractor.videosFromUrl(embedUrl, videoNameGen = { s -> "$name - $s" })
         embedUrl.contains("filemoon", true) -> {
             filemoonExtractor.videosFromUrl(embedUrl, prefix = "$name - ", headers = headers)
         }