From e69a0f141dc80b78ae9f51e62649b737f8a48721 Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Fri, 31 Mar 2023 04:18:33 +0700
Subject: [PATCH] sora: fix UHDMovies

---
 SoraStream/build.gradle.kts                             | 2 +-
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 8 ++++----
 SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt     | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 0bb2c706..9378c665 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 109
+version = 110
 
 
 cloudstream {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 429579fc..20e8717a 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1282,13 +1282,13 @@ object SoraExtractor : SoraStream() {
         }
 
         sources.apmap { (quality, link) ->
-            val driveLink = bypassTechmny(link ?: return@apmap null)
-            val base = getBaseUrl(driveLink ?: return@apmap null)
+            val driveLink = if(link?.contains("driveleech") == true) bypassDriveleech(link) else bypassTechmny(link ?: return@apmap)
+            val base = getBaseUrl(driveLink ?: return@apmap)
             val resDoc = app.get(driveLink).document
             val bitLink = resDoc.selectFirst("a.btn.btn-outline-success")?.attr("href")
             val downloadLink = if (bitLink.isNullOrEmpty()) {
                 val backupIframe = resDoc.select("a.btn.btn-outline-warning").attr("href")
-                extractBackupUHD(backupIframe ?: return@apmap null)
+                extractBackupUHD(backupIframe ?: return@apmap)
             } else {
                 extractMirrorUHD(bitLink, base)
             }
@@ -1307,7 +1307,7 @@ object SoraExtractor : SoraStream() {
                 ExtractorLink(
                     "UHDMovies",
                     "UHDMovies $tags $size",
-                    downloadLink ?: return@apmap null,
+                    downloadLink ?: return@apmap,
                     "",
                     qualities
                 )
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index ebe0033e..cd7299b1 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -675,6 +675,13 @@ suspend fun bypassTechmny(url: String) : String? {
     return fixUrl(path, getBaseUrl(driveUrl))
 }
 
+suspend fun bypassDriveleech(url: String) : String? {
+    val path = app.get(url).text.substringAfter("replace(\"")
+        .substringBefore("\")")
+    if (path == "/404") return null
+    return fixUrl(path, getBaseUrl(url))
+}
+
 private fun getTechmnyCookies(page: String): Triple<String, String, String> {
     val cat = "rdst_cat"
     val post = "rdst_post"