From 7264b5eef5f63877d89a8e5302b350bc274c497b Mon Sep 17 00:00:00 2001 From: hexated Date: Tue, 18 Oct 2022 08:13:02 +0700 Subject: [PATCH] fixed SoraExtractor --- .../src/main/kotlin/com/hexated/SoraExtractor.kt | 11 +++++++++-- SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index eace2e7b..5837552c 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -195,11 +195,18 @@ object SoraExtractor : SoraStream() { } suspend fun invoke123Movie( - id: String? = null, + tmdbId: Int? = null, + imdbId: String? = null, + season: Int? = null, + episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit ) { - val url = "$movie123API/imdb.php?imdb=$id&server=vcu" + val url = if(season == null) { + "$movie123API/imdb.php?imdb=$imdbId&server=vcu" + } else { + "$movie123API/tmdb_api.php?se=$season&ep=$episode&tmdb=$tmdbId&server_name=vcu" + } val iframe = app.get(url).document.selectFirst("iframe")?.attr("src") val doc = app.get( diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index 88d72cfa..130d0083 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -263,7 +263,14 @@ open class SoraStream : TmdbProvider() { invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback) }, { - if (res.type == "movie") invoke123Movie(res.imdbId, subtitleCallback, callback) + invoke123Movie( + res.id, + res.imdbId, + res.season, + res.episode, + subtitleCallback, + callback + ) })