From 897b0a86a26f492018e5aafe6a3e15b02c987c2a Mon Sep 17 00:00:00 2001 From: hexated Date: Tue, 8 Nov 2022 18:06:03 +0700 Subject: [PATCH] removed Youtube from source --- Movierulzhd/build.gradle.kts | 2 +- .../src/main/kotlin/com/hexated/Movierulzhd.kt | 3 ++- SoraStream/build.gradle.kts | 2 +- .../src/main/kotlin/com/hexated/SoraExtractor.kt | 14 +++----------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts index b0c06de6..27929331 100644 --- a/Movierulzhd/build.gradle.kts +++ b/Movierulzhd/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 18 +version = 19 cloudstream { diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt index a350587b..55a672e1 100644 --- a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt +++ b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt @@ -249,7 +249,8 @@ class Movierulzhd : MainAPI() { // source.startsWith("https://series.databasegdriveplayer.co") -> { // invokeDatabase(source, callback, subtitleCallback) // } - else -> loadExtractor(source, data, subtitleCallback, callback) + !source.contains("youtube") -> loadExtractor(source, data, subtitleCallback, callback) + else -> {} } } } diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index e6136602..f240b0ef 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 25 +version = 26 cloudstream { diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index e396d60e..2d85d936 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -515,7 +515,9 @@ object SoraExtractor : SoraStream() { referer = url ).parsed().embed_url + if(!source.contains("youtube")) { loadExtractor(source, "$idlixAPI/", subtitleCallback, callback) + } } } @@ -833,7 +835,7 @@ object SoraExtractor : SoraStream() { json?.subtitlingList?.map { sub -> subtitleCallback.invoke( SubtitleFile( - getVipLanguage(sub.languageAbbr ?: return@map), + sub.language ?: "", sub.subtitlingUrl ?: return@map ) ) @@ -905,16 +907,6 @@ fun getLanguage(str: String): String { return if (str.contains("(in_ID)")) "Indonesian" else str } -private fun getVipLanguage(str: String): String { - return when (str) { - "in_ID" -> "Indonesian" - "pt" -> "Portuguese" - else -> str.split("_").first().let { - SubtitleHelper.fromTwoLettersToLanguage(it).toString() - } - } -} - private fun getQuality(str: String): Int { return when (str) { "360p" -> Qualities.P240.value