From 54d8aad293d5a3176e705d88c299948783431a2b Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Tue, 22 Nov 2022 07:47:52 +0700
Subject: [PATCH] try fixing UHDMovies

---
 SoraStream/build.gradle.kts                   |  2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 29 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index a03dcbed..e5da92b7 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 33
+version = 34
 
 
 cloudstream {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 443a12e8..8910a966 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1227,22 +1227,23 @@ object SoraExtractor : SoraStream() {
                                 ?.attr("href")
                         )
                     }
-                }
+                }.filter { it.third?.contains(Regex("(https:)|(http:)")) == true }
 
+        val base = getBaseUrl(iframe.first().third ?: return)
         iframe.apmap { (quality, size, link) ->
+            delay(1000)
             val res = app.get(link ?: return@apmap null).document
-            val base = getBaseUrl(link)
-            val bitLink =
-                res.selectFirst("a.btn.btn-outline-success")?.attr("href") ?: return@apmap null
-            val downLink =
-                app.get(fixUrl(bitLink, base)).document.selectFirst("div.mb-4 a")?.attr("href")
-            val mirrorLink = app.get(
-                downLink ?: return@apmap null
-            ).document.selectFirst("form[method=post] a.btn.btn-primary")
-                ?.attr("onclick")?.substringAfter("Openblank('")?.substringBefore("')")?.let {
-                    app.get(it).document.selectFirst("script:containsData(input.value =)")
-                        ?.data()?.substringAfter("input.value = '")?.substringBefore("';")
-                }
+            val bitLink = res.selectFirst("a.btn.btn-outline-success")?.attr("href") ?: return@apmap null
+            val downLink = app.get(fixUrl(bitLink, base)).document.selectFirst("div.mb-4 a")?.attr("href")
+            val downPage = app.get(downLink ?: return@apmap null).document
+
+            val downloadLink = downPage.selectFirst("form[method=post] a.btn.btn-success")
+                ?.attr("onclick")?.substringAfter("Openblank('")?.substringBefore("')") ?: run {
+                val mirror = downPage.selectFirst("form[method=post] a.btn.btn-primary")
+                    ?.attr("onclick")?.substringAfter("Openblank('")?.substringBefore("')")
+                app.get(mirror ?: return@apmap null).document.selectFirst("script:containsData(input.value =)")
+                    ?.data()?.substringAfter("input.value = '")?.substringBefore("';")
+            }
 
             val videoQuality = Regex("(\\d{3,4})p").find(quality)?.groupValues?.getOrNull(1)?.toIntOrNull()
                 ?: Qualities.Unknown.value
@@ -1251,7 +1252,7 @@ object SoraExtractor : SoraStream() {
                 ExtractorLink(
                     "UHDMovies [$videoSize]",
                     "UHDMovies [$videoSize]",
-                    mirrorLink ?: return@apmap null,
+                    downloadLink ?: return@apmap null,
                     "",
                     videoQuality
                 )