From ec0f2bec849594af8c55d10a2e5538b0d9048302 Mon Sep 17 00:00:00 2001
From: jmir1 <jhmiramon@gmail.com>
Date: Tue, 12 Oct 2021 11:02:01 +0200
Subject: [PATCH] zoro: fix video links & separate qualities

---
 .../en/animepahe/KwikExtractor.kt             |  1 -
 src/en/zoro/build.gradle                      |  2 +-
 .../tachiyomi/animeextension/en/zoro/Zoro.kt  | 23 +++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt
index 15f4d24f0..9844efa97 100644
--- a/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt
+++ b/src/en/animepahe/src/eu/kanade/tachiyomi/animeextension/en/animepahe/KwikExtractor.kt
@@ -25,7 +25,6 @@ SOFTWARE.
  *
  */
 
-
 package eu.kanade.tachiyomi.animeextension.en.animepahe
 
 import eu.kanade.tachiyomi.network.GET
diff --git a/src/en/zoro/build.gradle b/src/en/zoro/build.gradle
index ed00dc3e9..5c3b33ada 100644
--- a/src/en/zoro/build.gradle
+++ b/src/en/zoro/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'zoro.to (experimental)'
     pkgNameSuffix = 'en.zoro'
     extClass = '.Zoro'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '12'
 }
 
diff --git a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt
index 54731f182..1d0fdbb20 100644
--- a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt
+++ b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt
@@ -99,17 +99,17 @@ class Zoro : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val videoList = mutableListOf<Video>()
         serversHtml.select("div.server-item").forEach {
             val id = it.attr("data-id")
-            val quality = it.attr("data-type")
-            val video = getVideoFromServer(
+            val subDub = it.attr("data-type")
+            val videos = getVideosFromServer(
                 client.newCall(GET("$baseUrl/ajax/v2/episode/sources?id=$id", episodeReferer)).execute(),
-                quality
+                subDub
             )
-            if (video != null) videoList.add(video)
+            if (videos != null) videoList.addAll(videos)
         }
         return videoList
     }
 
-    private fun getVideoFromServer(response: Response, quality: String): Video? {
+    private fun getVideosFromServer(response: Response, subDub: String): List<Video>? {
         val body = response.body!!.string()
         val url = body.substringAfter("\"link\":\"").substringBefore("\"").toHttpUrl()
         val id = url.pathSegments.last()
@@ -121,8 +121,17 @@ class Zoro : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val lol = recaptchaClient.newCall(GET("$url&autoPlay=1", referer)).execute().body!!.string()
         Log.i("bruh", lol)
         if (!lol.contains("{\"sources\":[{\"file\":\"")) return null
-        val videoUrl = lol.substringAfter("{\"sources\":[{\"file\":\"").substringBefore("\"")
-        return Video(videoUrl, quality, videoUrl, null)
+        val masterUrl = lol.substringAfter("{\"sources\":[{\"file\":\"").substringBefore("\"")
+        Log.i("bruhvideourl", masterUrl)
+        val masterPlaylist = client.newCall(GET(masterUrl)).execute().body!!.string()
+        val videoList = mutableListOf<Video>()
+        masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:").forEach {
+            val quality = it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p - $subDub"
+            val videoUrl = masterUrl.substringBeforeLast("/") + "/" + it.substringAfter("\n").substringBefore("\n")
+            Log.i("bruhvid", videoUrl)
+            videoList.add(Video(videoUrl, quality, videoUrl, null))
+        }
+        return videoList
     }
 
     override fun videoListSelector() = throw Exception("not used")