diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index e2190137..48483099 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -723,18 +723,17 @@ object SoraExtractor : SoraStream() { season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit, ) { val headers = mapOf( "lang" to "en", "versioncode" to "32", "clienttype" to "android_tem3", ) - val vipAPI = - base64DecodeAPI("cA==YXA=cy8=Y20=di8=LnQ=b2s=a2w=bG8=aS4=YXA=ZS0=aWw=b2I=LW0=Z2E=Ly8=czo=dHA=aHQ=") + val vipAPI = base64DecodeAPI("cA==YXA=cy8=Y20=di8=LnQ=b2s=a2w=bG8=aS4=YXA=ZS0=aWw=b2I=LW0=Z2E=Ly8=czo=dHA=aHQ=") val searchUrl = base64DecodeAPI("b20=LmM=b2s=a2w=bG8=Ly8=czo=dHA=aHQ=") - val doc = app.get( - "$searchUrl/search?keyword=$title", - ).document + + val doc = app.get("$searchUrl/search?keyword=$title",).document val scriptData = doc.select("div.search-list div.search-video-card").map { Triple( diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index bd16ee03..9ac6474d 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -3,11 +3,8 @@ package com.hexated import com.fasterxml.jackson.annotation.JsonProperty import com.hexated.SoraExtractor.invoke123Movie import com.hexated.SoraExtractor.invokeAnimes -import com.hexated.SoraExtractor.invokeBaymovies import com.hexated.SoraExtractor.invokeBlackmovies import com.hexated.SoraExtractor.invokeBollyMaza -import com.hexated.SoraExtractor.invokeChillmovies0 -import com.hexated.SoraExtractor.invokeChillmovies1 import com.hexated.SoraExtractor.invokeCodexmovies import com.hexated.SoraExtractor.invokeDbgo import com.hexated.SoraExtractor.invokeFilmxy @@ -342,6 +339,7 @@ open class SoraStream : TmdbProvider() { res.season, res.episode, subtitleCallback, + callback, ) }, { diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt index 911767ea..0e2f6ea6 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt @@ -41,7 +41,7 @@ data class FilmxyCookies( fun String.filterIframe(seasonNum: Int?, lastSeason: Int?, year: Int?): Boolean { return if (seasonNum != null) { if (lastSeason == 1) { - this.contains(Regex("(?i)(S0?$seasonNum)|(Season\\s0?$seasonNum)|([0-9]{3,4}p)")) && !this.contains( + this.contains(Regex("(?i)(S0?$seasonNum)|(Season\\s0?$seasonNum)|(\\d{3,4}p)")) && !this.contains( "Download", true ) @@ -617,7 +617,7 @@ fun getLanguage(str: String): String { fun bytesToGigaBytes( number: Double ): Double = number / 1024000000 fun getKisskhTitle(str: String?): String? { - return str?.replace(Regex("[^a-zA-Z0-9]"), "-") + return str?.replace(Regex("[^a-zA-Z\\d]"), "-") } fun getQuality(str: String): Int { @@ -641,16 +641,6 @@ fun getGMoviesQuality(str: String): Int { } } -fun getSoraQuality(quality: String): Int { - return when (quality) { - "GROOT_FD" -> Qualities.P360.value - "GROOT_LD" -> Qualities.P480.value - "GROOT_SD" -> Qualities.P720.value - "GROOT_HD" -> Qualities.P1080.value - else -> Qualities.Unknown.value - } -} - fun getFDoviesQuality(str: String): String { return when { str.contains("1080P", true) -> "1080P"