small cleaning

This commit is contained in:
hexated 2022-12-14 16:35:04 +07:00
parent 990c0f6f73
commit 508f0e76be
2 changed files with 9 additions and 17 deletions

View File

@ -964,7 +964,7 @@ object SoraExtractor : SoraStream() {
} }
suspend fun invoKisskh( suspend fun invokeKisskh(
title: String? = null, title: String? = null,
season: Int? = null, season: Int? = null,
episode: Int? = null, episode: Int? = null,
@ -1047,7 +1047,7 @@ object SoraExtractor : SoraStream() {
} }
suspend fun invoZoro( suspend fun invokeZoro(
id: Int? = null, id: Int? = null,
season: Int? = null, season: Int? = null,
episode: Int? = null, episode: Int? = null,
@ -1562,7 +1562,7 @@ object SoraExtractor : SoraStream() {
} }
suspend fun invoCrunchyroll( suspend fun invokeCrunchyroll(
title: String? = null, title: String? = null,
epsTitle: String? = null, epsTitle: String? = null,
subtitleCallback: (SubtitleFile) -> Unit, subtitleCallback: (SubtitleFile) -> Unit,
@ -1650,14 +1650,6 @@ data class RabbitSources(
@JsonProperty("tracks") val tracks: ArrayList<Track>? = arrayListOf(), @JsonProperty("tracks") val tracks: ArrayList<Track>? = arrayListOf(),
) )
data class VideoData(
@JsonProperty("mediaUrl") val mediaUrl: String? = null,
)
data class Video(
@JsonProperty("data") val data: VideoData? = null,
)
data class SubtitlingList( data class SubtitlingList(
@JsonProperty("languageAbbr") val languageAbbr: String? = null, @JsonProperty("languageAbbr") val languageAbbr: String? = null,
@JsonProperty("language") val language: String? = null, @JsonProperty("language") val language: String? = null,

View File

@ -1,8 +1,6 @@
package com.hexated package com.hexated
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
import com.hexated.SoraExtractor.invoCrunchyroll
import com.hexated.SoraExtractor.invoKisskh
import com.hexated.SoraExtractor.invoke123Movie import com.hexated.SoraExtractor.invoke123Movie
import com.hexated.SoraExtractor.invokeDbgo import com.hexated.SoraExtractor.invokeDbgo
import com.hexated.SoraExtractor.invokeFilmxy import com.hexated.SoraExtractor.invokeFilmxy
@ -21,14 +19,16 @@ import com.hexated.SoraExtractor.invokeXmovies
import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
import com.lagradost.cloudstream3.metaproviders.TmdbProvider import com.lagradost.cloudstream3.metaproviders.TmdbProvider
import com.hexated.SoraExtractor.invoZoro import com.hexated.SoraExtractor.invokeCrunchyroll
import com.hexated.SoraExtractor.invokeFDMovies import com.hexated.SoraExtractor.invokeFDMovies
import com.hexated.SoraExtractor.invokeFwatayako import com.hexated.SoraExtractor.invokeFwatayako
import com.hexated.SoraExtractor.invokeGMovies import com.hexated.SoraExtractor.invokeGMovies
import com.hexated.SoraExtractor.invokeKisskh
import com.hexated.SoraExtractor.invokeLing import com.hexated.SoraExtractor.invokeLing
import com.hexated.SoraExtractor.invokeM4uhd import com.hexated.SoraExtractor.invokeM4uhd
import com.hexated.SoraExtractor.invokeTvMovies import com.hexated.SoraExtractor.invokeTvMovies
import com.hexated.SoraExtractor.invokeUhdmovies import com.hexated.SoraExtractor.invokeUhdmovies
import com.hexated.SoraExtractor.invokeZoro
import com.lagradost.cloudstream3.utils.AppUtils.parseJson import com.lagradost.cloudstream3.utils.AppUtils.parseJson
import com.lagradost.cloudstream3.utils.AppUtils.toJson import com.lagradost.cloudstream3.utils.AppUtils.toJson
import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.ExtractorLink
@ -340,7 +340,7 @@ open class SoraStream : TmdbProvider() {
// ) // )
// }, // },
{ {
if (res.season != null && res.isAnime) invoZoro( if (res.season != null && res.isAnime) invokeZoro(
res.id, res.id,
res.season, res.season,
res.episode, res.episode,
@ -349,7 +349,7 @@ open class SoraStream : TmdbProvider() {
) )
}, },
{ {
if (res.season != null && res.isAnime) invoCrunchyroll( if (res.season != null && res.isAnime) invokeCrunchyroll(
res.title, res.title,
res.epsTitle, res.epsTitle,
subtitleCallback, subtitleCallback,
@ -412,7 +412,7 @@ open class SoraStream : TmdbProvider() {
) )
}, },
{ {
invoKisskh(res.title, res.season, res.episode, subtitleCallback, callback) invokeKisskh(res.title, res.season, res.episode, subtitleCallback, callback)
}, },
{ {
invokeLing( invokeLing(