minor fix

SaurabhKaperwan · Feb 26, 2025 · bc9a161 · bc9a161
1 parent 79fa43b
commit bc9a161
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/CineStream/build.gradle.kts b/CineStream/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
-version = 80
+version = 81
 
 android {
     defaultConfig {

diff --git a/CineStream/src/main/kotlin/com/megix/CineStreamExtractors.kt b/CineStream/src/main/kotlin/com/megix/CineStreamExtractors.kt
@@ -1277,11 +1277,11 @@ object CineStreamExtractors : CineStreamProvider() {
         val epId = data.episodes.find { it.number == episode }?.id ?: return
         val isDubbed = data.episodes.find { it.number == episode }?.isDubbed ?: false
         val types =  mutableListOf("sub")
-        //if(isDubbed == true) types.add("dub")
+        if(isDubbed == true) types.add("dub")
         val servers = mutableListOf("vidstreaming", "vidcloud")
         types.map { t ->
             servers.map { server ->
-                val epJson = app.get("$CONSUMET_API/anime/zoro/watch?episodeId=${epId.replace("both", t)}&server=$server").text
+                val epJson = app.get("$CONSUMET_API/anime/zoro/watch?episodeId=$epId&${'$'}${t}&server=$server").text
                 val epData = tryParseJson<HiAnimeMedia>(epJson) ?: return@map
 
                 epData.sources.map {

diff --git a/Extractors/build.gradle.kts b/Extractors/build.gradle.kts
@@ -1,4 +1,4 @@
-version = 30
+version = 31
 
 cloudstream {
     //language = "hi"

diff --git a/Extractors/src/main/kotlin/com/megix/Extractors.kt b/Extractors/src/main/kotlin/com/megix/Extractors.kt
@@ -15,7 +15,11 @@ fun getIndexQuality(str: String?): Int {
         ?: Qualities.Unknown.value
 }
 
-class Luxdrive : ExtractorApi() {
+class Luxdrive2 : Luxdrive() {
+    override val mainUrl = "https://files.luxedrive.space"
+}
+
+open class Luxdrive : ExtractorApi() {
     override val name: String = "Luxdrive"
     override val mainUrl: String = "https://new.luxedrive.online"
     override val requiresReferer = false
@@ -27,13 +31,14 @@ class Luxdrive : ExtractorApi() {
         callback: (ExtractorLink) -> Unit
     ) {
         val document = app.get(url).document
-        document.select("div > a").map {
+        document.select("div > div > a").map {
             val href = it.attr("href")
             loadExtractor(href, "", subtitleCallback, callback)
         }
     }
 }
 
+
 class Driveseed : Driveleech() {
     override val name: String = "Driveseed"
     override val mainUrl: String = "https://driveseed.org"
@@ -457,8 +462,9 @@ open class GDFlix : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val res = app.get(url, allowRedirects = true)
-        val document = res.document
+        val newUrl = url.replace(mainUrl, "https://new2.gdflix.dad")
+        val document = app.get(newUrl).document
+
         val fileName = document.selectFirst("ul > li.list-group-item")?.text()?.substringAfter("Name : ") ?: ""
 
         document.select("div.text-center a").amap {
@@ -578,7 +584,7 @@ open class GDFlix : ExtractorApi() {
             else if (text.contains("Instant DL"))
             {
                 val instantLink = it.attr("href")
-                val link = app.get(instantLink, timeout = 30L, allowRedirects = false).headers["Location"]?.split("url=") ?. getOrNull(1) ?: ""
+                val link = app.get(instantLink, timeout = 30L, allowRedirects = false).headers["location"]?.substringAfter("url=") ?: ""
                 callback.invoke(
                     ExtractorLink(
                         "GDFlix[Instant Download]",
@@ -590,12 +596,11 @@ open class GDFlix : ExtractorApi() {
                 )
             }
             else if(text.contains("CLOUD DOWNLOAD [FSL]")) {
-                val link = it.attr("href").substringAfter("url=")
                 callback.invoke(
                     ExtractorLink(
                         "GDFlix[FSL]",
                         "GDFlix[FSL] $fileName",
-                        link,
+                        it.attr("href"),
                         "",
                         getIndexQuality(fileName)
                     )

diff --git a/Extractors/src/main/kotlin/com/megix/ExtractorsPlugin.kt b/Extractors/src/main/kotlin/com/megix/ExtractorsPlugin.kt
@@ -9,6 +9,7 @@ class ExtractorsPlugin: Plugin() {
     override fun load(context: Context) {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerExtractorAPI(Luxdrive())
+        registerExtractorAPI(Luxdrive2())
         registerExtractorAPI(VCloud())
         registerExtractorAPI(GDFlix())
         registerExtractorAPI(GDFlix3())