From 43c6c3108b270af2ed28802cedc53ebbf24ee6cf Mon Sep 17 00:00:00 2001 From: hexated Date: Sat, 22 Apr 2023 17:01:28 +0700 Subject: [PATCH] revert --- .../main/kotlin/com/hexated/SoraExtractor.kt | 36 +++++++++---------- .../src/main/kotlin/com/hexated/SoraStream.kt | 20 +++++------ .../main/kotlin/com/hexated/SoraStreamLite.kt | 20 +++++------ 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index e1d7db87..b63cf1f3 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -649,24 +649,24 @@ object SoraExtractor : SoraStream() { ) } - if(season == null) return - json.definitionList?.map { video -> - val media = app.get( - "${BuildConfig.SORA_API}/movieDrama/getPlayInfo?category=${type}&contentId=${id}&episodeId=${json.id}&definition=${video.code}", - headers = soraHeaders, - ).parsedSafe()?.data - - callback.invoke( - ExtractorLink( - this.name, - this.name, - media?.mediaUrl ?: return@map null, - base64DecodeAPI("Lw==b20=LmM=b2s=a2w=bG8=Ly8=czo=dHA=aHQ="), - getSoraQuality(media.currentDefinition ?: ""), - true, - ) - ) - } +// if(season == null) return +// json.definitionList?.map { video -> +// val media = app.get( +// "${BuildConfig.SORA_API}/movieDrama/getPlayInfo?category=${type}&contentId=${id}&episodeId=${json.id}&definition=${video.code}", +// headers = soraHeaders, +// ).parsedSafe()?.data +// +// callback.invoke( +// ExtractorLink( +// this.name, +// this.name, +// media?.mediaUrl ?: return@map null, +// base64DecodeAPI("Lw==b20=LmM=b2s=a2w=bG8=Ly8=czo=dHA=aHQ="), +// getSoraQuality(media.currentDefinition ?: ""), +// true, +// ) +// ) +// } } suspend fun invokeXmovies( diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index 974b6d3c..ca8c9908 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -369,16 +369,16 @@ open class SoraStream : TmdbProvider() { val res = parseJson(data) argamap( -// { -// invokeSoraStream( -// res.title, -// res.year, -// res.season, -// res.episode, -// subtitleCallback, -// callback -// ) -// }, + { + invokeSoraStream( + res.title, + res.year, + res.season, + res.episode, + subtitleCallback, + callback + ) + }, { invokeTwoEmbed(res.id, res.season, res.episode, subtitleCallback, callback) }, diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt index 130e0128..68d78333 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt @@ -64,16 +64,16 @@ class SoraStreamLite : SoraStream() { subtitleCallback ) }, -// { -// invokeSoraStream( -// res.title, -// res.year, -// res.season, -// res.episode, -// subtitleCallback, -// callback -// ) -// }, + { + invokeSoraStream( + res.title, + res.year, + res.season, + res.episode, + subtitleCallback, + callback + ) + }, { if (!res.isAnime) invokeNinetv( res.id,