From 7cffec9a79caa0b54c43ff4ecd511cce9d283e69 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Fri, 15 Sep 2023 07:56:49 -0300
Subject: [PATCH] refactor(pt/animeshouse): Use PlaylistUtils (#2197)

---
 .../dooplay/animeshouse/additional.gradle     |  3 +++
 .../src/extractors/EdifierExtractor.kt        |  1 -
 .../src/extractors/GenericExtractor.kt        | 17 +++----------
 .../src/extractors/McpExtractor.kt            |  1 -
 .../src/extractors/MpFourDooExtractor.kt      | 24 +++----------------
 5 files changed, 9 insertions(+), 37 deletions(-)
 create mode 100644 multisrc/overrides/dooplay/animeshouse/additional.gradle

diff --git a/multisrc/overrides/dooplay/animeshouse/additional.gradle b/multisrc/overrides/dooplay/animeshouse/additional.gradle
new file mode 100644
index 000000000..6b4989bb4
--- /dev/null
+++ b/multisrc/overrides/dooplay/animeshouse/additional.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    implementation(project(":lib-playlist-utils"))
+}
diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/EdifierExtractor.kt b/multisrc/overrides/dooplay/animeshouse/src/extractors/EdifierExtractor.kt
index 855c66277..00aa044f2 100644
--- a/multisrc/overrides/dooplay/animeshouse/src/extractors/EdifierExtractor.kt
+++ b/multisrc/overrides/dooplay/animeshouse/src/extractors/EdifierExtractor.kt
@@ -9,7 +9,6 @@ class EdifierExtractor(
     private val client: OkHttpClient,
     private val headers: Headers,
 ) {
-
     private val regexEdifier = Regex(""""file":"(.*?)","label":"(\S+?)"""")
     private val playerName = "EDIFIER"
 
diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/GenericExtractor.kt b/multisrc/overrides/dooplay/animeshouse/src/extractors/GenericExtractor.kt
index 0a92611d7..c7d37ea1d 100644
--- a/multisrc/overrides/dooplay/animeshouse/src/extractors/GenericExtractor.kt
+++ b/multisrc/overrides/dooplay/animeshouse/src/extractors/GenericExtractor.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors
 
 import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 
@@ -9,10 +9,9 @@ class GenericExtractor(
     private val client: OkHttpClient,
     private val headers: Headers,
 ) {
-
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
     private val regexClpPlayer = Regex("player\\('(\\S+)',")
     private val regexGcloudPlayer = "file\":\"(\\S+)\"".toRegex()
-    private val regexQuality = Regex("(?<=RESOLUTION=)\\d+x(\\d+).*?\n(https.*)")
 
     fun getVideoList(url: String, js: String): List<Video> {
         val (player, regex) = when {
@@ -22,17 +21,7 @@ class GenericExtractor(
 
         val playlistUrl = regex.find(js)!!.groupValues.get(1)
         if ("m3u8.php" in playlistUrl) {
-            client.newCall(GET(playlistUrl, headers)).execute().use { req ->
-                val body = req.body.string()
-                val videos = regexQuality.findAll(body).map {
-                    val quality = "$player: " + it.groupValues.get(1) + "p"
-                    val videoUrl = it.groupValues.get(2)
-                    Video(videoUrl, quality, videoUrl, headers)
-                }.toList()
-                if (videos.size > 0) {
-                    return videos
-                }
-            }
+            return playlistUtils.extractFromHls(playlistUrl, videoNameGen = { "$player: $it" })
         }
 
         return listOf(Video(playlistUrl, player, playlistUrl, headers))
diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/McpExtractor.kt b/multisrc/overrides/dooplay/animeshouse/src/extractors/McpExtractor.kt
index 4948a7783..65695d8e6 100644
--- a/multisrc/overrides/dooplay/animeshouse/src/extractors/McpExtractor.kt
+++ b/multisrc/overrides/dooplay/animeshouse/src/extractors/McpExtractor.kt
@@ -9,7 +9,6 @@ class McpExtractor(
     private val client: OkHttpClient,
     private val headers: Headers,
 ) {
-
     private val regexEpId = Regex("ss,\"(\\d+)\"")
     private val regexVideoUrl = Regex("h\":\"(\\S+?)\"")
     private val apiUrl = "https://clp-new.animeshouse.net/ah-clp-new"
diff --git a/multisrc/overrides/dooplay/animeshouse/src/extractors/MpFourDooExtractor.kt b/multisrc/overrides/dooplay/animeshouse/src/extractors/MpFourDooExtractor.kt
index 9a5996f28..b241bb02b 100644
--- a/multisrc/overrides/dooplay/animeshouse/src/extractors/MpFourDooExtractor.kt
+++ b/multisrc/overrides/dooplay/animeshouse/src/extractors/MpFourDooExtractor.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.pt.animeshouse.extractors
 
 import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 
@@ -11,32 +11,14 @@ class MpFourDooExtractor(
 ) {
     private val regexMpdoo = Regex("file\":\"(.*?)\"")
     private val playerName = "Mp4Doo"
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
 
     fun getVideoList(js: String): List<Video> {
         val videoUrl = regexMpdoo.find(js)!!.groupValues
             .get(1)
             .replace("fy..", "fy.v.")
         return if (videoUrl.endsWith("playlist.m3u8")) {
-            val playlistBody = client.newCall(GET(videoUrl, headers)).execute()
-                .use { it.body.string() }
-
-            val separator = "#EXT-X-STREAM-INF:"
-            playlistBody.substringAfter(separator).split(separator).map {
-                val quality = playerName + " - " + it.substringAfter("RESOLUTION=")
-                    .substringAfter("x")
-                    .substringBefore("\n")
-                    .substringBefore(",") + "p"
-
-                val path = it.substringAfter("\n").substringBefore("\n")
-
-                val playlistUrl = if (!path.startsWith("https:")) {
-                    videoUrl.replace("playlist.m3u8", path)
-                } else {
-                    path
-                }
-
-                Video(playlistUrl, quality, playlistUrl, headers)
-            }
+            playlistUtils.extractFromHls(videoUrl, videoNameGen = { "$playerName: $it" })
         } else {
             listOf(Video(videoUrl, playerName, videoUrl, headers))
         }