From cffce413937828292559aebc5055a9161658cf11 Mon Sep 17 00:00:00 2001 From: hexated Date: Thu, 29 Dec 2022 20:19:16 +0700 Subject: [PATCH] [Sora] small fix in moviesbay --- SoraStream/build.gradle.kts | 2 +- SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 3 ++- SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt | 8 ++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index cfbc4520..dc48625c 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 64 +version = 65 cloudstream { diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index 320c9b25..0dde83a9 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -1536,8 +1536,9 @@ object SoraExtractor : SoraStream() { val size = media[index.minus(1)] val quality = media[index.minus(2)] val qualityName = media[index.minus(3)] + val gdriveLink = getDirectGdrive(it) - val doc = app.get(it).document + val doc = app.get(gdriveLink).document val form = doc.select("form#download-form").attr("action") val uc = doc.select("input#uc-download-link").attr("value") val link = app.post( diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt index 03611b30..942dd587 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt @@ -254,6 +254,14 @@ suspend fun extractCovyn(url: String?): Pair? { return Pair(videoLink, size) } +fun getDirectGdrive(url: String): String { + return if(url.endsWith("share_link")) { + "https://drive.google.com/uc?id=${url.substringAfter("/d/").substringBefore("/")}&export=download" + } else { + url + } +} + suspend fun bypassFdAds(url: String): String? { val res = app.get(url).document val freeRedirect = res.selectFirst("a#link")?.attr("href")