From fb566a6796bfd4943ebb9446e4253f3587ced937 Mon Sep 17 00:00:00 2001 From: hexated Date: Sun, 30 Apr 2023 00:58:58 +0700 Subject: [PATCH] added fallback in Shivamhw and fixed hdfilmcehennemi --- Hdfilmcehennemi/build.gradle.kts | 2 +- .../kotlin/com/hexated/Hdfilmcehennemi.kt | 29 ++++++++----------- SoraStream/build.gradle.kts | 2 +- .../main/kotlin/com/hexated/SoraExtractor.kt | 4 ++- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/Hdfilmcehennemi/build.gradle.kts b/Hdfilmcehennemi/build.gradle.kts index b7f6e817..008bccce 100644 --- a/Hdfilmcehennemi/build.gradle.kts +++ b/Hdfilmcehennemi/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 8 +version = 9 cloudstream { diff --git a/Hdfilmcehennemi/src/main/kotlin/com/hexated/Hdfilmcehennemi.kt b/Hdfilmcehennemi/src/main/kotlin/com/hexated/Hdfilmcehennemi.kt index 383eb6c0..ff9b2b60 100644 --- a/Hdfilmcehennemi/src/main/kotlin/com/hexated/Hdfilmcehennemi.kt +++ b/Hdfilmcehennemi/src/main/kotlin/com/hexated/Hdfilmcehennemi.kt @@ -168,25 +168,20 @@ class Hdfilmcehennemi : MainAPI() { url, referer = "${mainUrl}/" ).document.select("script") - .find { it.data().contains("sources:") }?.data() - val videoData = script?.substringAfter("sources: [") - ?.substringBefore("],")?.addMarks("file") - val subData = script?.substringAfter("tracks: [")?.substringBefore("]")?.addMarks("file") - ?.addMarks("label")?.addMarks("kind") - - tryParseJson(videoData)?.file?.let { m3uLink -> - callback.invoke( - ExtractorLink( - source, - source, - m3uLink, - "$mainUrl/", - Qualities.Unknown.value, - true - ) + .find { it.data().contains("sources:") }?.data() ?: return + val videoData = getAndUnpack(script).substringAfter("file_link=\"").substringBefore("\";") + val subData = script.substringAfter("tracks: [").substringBefore("]") + callback.invoke( + ExtractorLink( + source, + source, + base64Decode(videoData), + "$mainUrl/", + Qualities.Unknown.value, + true ) - } + ) tryParseJson>("[${subData}]") ?.filter { it.kind == "captions" }?.map { diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index 2619a62f..4d8f4f97 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.konan.properties.Properties // use an integer for version numbers -version = 124 +version = 125 android { defaultConfig { diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index f212342e..25d9746b 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -2872,11 +2872,13 @@ object SoraExtractor : SoraStream() { }?.map { source -> val quality = getIndexQuality(source.first) val tags = getIndexQualityTags(source.first) + val video = source.third?.removePrefix("vlc://") ?: return@map + if(!app.get(video).isSuccessful) return@map callback.invoke( ExtractorLink( "Shivamhw", "Shivamhw $tags [${source.second}]", - source.third?.removePrefix("vlc://") ?: return@map, + video, "", quality, )