recloudstream
/
cloudstream-extensions-hexated
mirror of https://github.com/hexated/cloudstream-extensions-hexated.git
6
2
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disabled UHDMovies

This commit is contained in:
hexated 2022-11-24 13:27:52 +07:00
parent e64cfcc7b6
commit 7c254422a3
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
View File

@ -957,7 +957,7 @@ object SoraExtractor : SoraStream() {
).apmap { server -> ).apmap { server ->
delay(1000) delay(1000)
val sources = val sources =
app.get("$consumetFlixhqAPI/watch?episodeId=$episodeId&mediaId=$id&server=$server") app.get("$consumetFlixhqAPI/watch?episodeId=$episodeId&mediaId=$id&server=$server", timeout = 120L)
.parsedSafe<ConsumetSourcesResponse>() .parsedSafe<ConsumetSourcesResponse>()
val name = fixTitle(server) val name = fixTitle(server)
sources?.sources?.map { sources?.sources?.map {
@ -1095,7 +1095,7 @@ object SoraExtractor : SoraStream() {
}?.id ?: return }?.id ?: return
delay(1000) delay(1000)
val sources = app.get("$consumetZoroAPI/watch?episodeId=$episodeId") val sources = app.get("$consumetZoroAPI/watch?episodeId=$episodeId", timeout = 120L)
.parsedSafe<ConsumetSourcesResponse>() ?: return .parsedSafe<ConsumetSourcesResponse>() ?: return
sources.sources?.map { sources.sources?.map {
@ -1315,7 +1315,7 @@ data class FilmxyCookies(
fun String.filterIframe(seasonNum: Int?, year: Int?): Boolean { fun String.filterIframe(seasonNum: Int?, year: Int?): Boolean {
return if (seasonNum != null) { return if (seasonNum != null) {
this.contains(Regex("(?i)(S0?$seasonNum)")) && !this.contains("Download", true) this.contains(Regex("(?i)(S0?$seasonNum)|(Season\\s0?$seasonNum)")) && !this.contains("Download", true)
} else { } else {
this.contains("$year", true) && !this.contains("Download", true) this.contains("$year", true) && !this.contains("Download", true)
} }

26
SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
View File

@ -172,6 +172,7 @@ open class SoraStream : TmdbProvider() {
val poster = getOriImageUrl(res.backdropPath) val poster = getOriImageUrl(res.backdropPath)
val orgTitle = res.originalTitle ?: res.originalName ?: return null val orgTitle = res.originalTitle ?: res.originalName ?: return null
val year = (res.releaseDate ?: res.firstAirDate)?.split("-")?.first()?.toIntOrNull() val year = (res.releaseDate ?: res.firstAirDate)?.split("-")?.first()?.toIntOrNull()
val rating = res.vote_average.toString().toRatingInt()
val genres = res.genres?.mapNotNull { it.name } val genres = res.genres?.mapNotNull { it.name }
val show = if (genres?.contains("Animation") == true && res.original_language == "ja") "Anime" else "Series/Movies" val show = if (genres?.contains("Animation") == true && res.original_language == "ja") "Anime" else "Series/Movies"
@ -230,6 +231,7 @@ open class SoraStream : TmdbProvider() {
this.year = year this.year = year
this.plot = res.overview this.plot = res.overview
this.tags = genres this.tags = genres
this.rating = rating
this.showStatus = getStatus(res.status) this.showStatus = getStatus(res.status)
this.recommendations = recommendations this.recommendations = recommendations
this.actors = actors this.actors = actors
@ -254,6 +256,7 @@ open class SoraStream : TmdbProvider() {
this.year = year this.year = year
this.plot = res.overview this.plot = res.overview
this.tags = genres this.tags = genres
this.rating = rating
this.recommendations = recommendations this.recommendations = recommendations
this.actors = actors this.actors = actors
addTrailer(trailer) addTrailer(trailer)
@ -431,17 +434,17 @@ open class SoraStream : TmdbProvider() {
callback callback
) )
}, },
{ // {
invokeUhdmovies( // invokeUhdmovies(
res.title, // res.title,
res.year, // res.year,
res.season, // res.season,
res.lastSeason, // res.lastSeason,
res.episode, // res.episode,
subtitleCallback, // subtitleCallback,
callback // callback
) // )
}, // },
{ {
invokeFwatayako(res.imdbId, res.season, res.episode, subtitleCallback, callback) invokeFwatayako(res.imdbId, res.season, res.episode, subtitleCallback, callback)
}, },
@ -572,6 +575,7 @@ open class SoraStream : TmdbProvider() {
@JsonProperty("release_date") val releaseDate: String? = null, @JsonProperty("release_date") val releaseDate: String? = null,
@JsonProperty("first_air_date") val firstAirDate: String? = null, @JsonProperty("first_air_date") val firstAirDate: String? = null,
@JsonProperty("overview") val overview: String? = null, @JsonProperty("overview") val overview: String? = null,
@JsonProperty("vote_average") val vote_average: Any? = null,
@JsonProperty("original_language") val original_language: String? = null, @JsonProperty("original_language") val original_language: String? = null,
@JsonProperty("status") val status: String? = null, @JsonProperty("status") val status: String? = null,
@JsonProperty("genres") val genres: ArrayList<Genres>? = arrayListOf(), @JsonProperty("genres") val genres: ArrayList<Genres>? = arrayListOf(),