mirror of
https://github.com/hexated/cloudstream-extensions-hexated.git
synced 2024-08-15 00:03:22 +00:00
fixed #378
This commit is contained in:
parent
3ea91518ef
commit
f2fbf9c2f7
6 changed files with 14 additions and 18 deletions
|
@ -1,7 +1,7 @@
|
||||||
import org.jetbrains.kotlin.konan.properties.Properties
|
import org.jetbrains.kotlin.konan.properties.Properties
|
||||||
|
|
||||||
// use an integer for version numbers
|
// use an integer for version numbers
|
||||||
version = 193
|
version = 194
|
||||||
|
|
||||||
android {
|
android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
|
|
@ -359,6 +359,11 @@ class Streamwish : Filesim() {
|
||||||
override var mainUrl = "https://streamwish.to"
|
override var mainUrl = "https://streamwish.to"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class Wishfast : Filesim() {
|
||||||
|
override val name = "Wishfast"
|
||||||
|
override var mainUrl = "https://wishfast.top"
|
||||||
|
}
|
||||||
|
|
||||||
class FilelionsTo : Filesim() {
|
class FilelionsTo : Filesim() {
|
||||||
override val name = "Filelions"
|
override val name = "Filelions"
|
||||||
override var mainUrl = "https://filelions.to"
|
override var mainUrl = "https://filelions.to"
|
||||||
|
|
|
@ -246,10 +246,6 @@ object SoraExtractor : SoraStream() {
|
||||||
} else {
|
} else {
|
||||||
"$multimoviesAPI/episodes/$fixTitle-${season}x${episode}"
|
"$multimoviesAPI/episodes/$fixTitle-${season}x${episode}"
|
||||||
}
|
}
|
||||||
val req = app.get(url)
|
|
||||||
val directUrl = getBaseUrl(req.url)
|
|
||||||
val iframe = req.document.selectFirst("div.pframe iframe")?.attr("src")
|
|
||||||
loadCustomExtractor("Multimovies", iframe ?: return, "$directUrl/", subtitleCallback, callback)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun invokeNetmovies(
|
suspend fun invokeNetmovies(
|
||||||
|
@ -1933,13 +1929,10 @@ object SoraExtractor : SoraStream() {
|
||||||
"$twoEmbedAPI/embedtv/$imdbId&s=$season&e=$episode"
|
"$twoEmbedAPI/embedtv/$imdbId&s=$season&e=$episode"
|
||||||
}
|
}
|
||||||
|
|
||||||
val iframesrc = app.get(url).document.selectFirst("iframe#vsrcs")?.attr("data-src") ?: return
|
val framesrc = app.get(url).document.selectFirst("iframe#iframesrc")?.attr("data-src") ?: return
|
||||||
val ref = getBaseUrl(iframesrc)
|
val ref = getBaseUrl(framesrc)
|
||||||
val framesrc = app.get(
|
val id = framesrc.substringAfter("id=").substringBefore("&")
|
||||||
iframesrc
|
loadExtractor("https://wishfast.top/e/$id", "$ref/", subtitleCallback, callback)
|
||||||
).document.selectFirst("iframe#framesrc")?.attr("src")
|
|
||||||
|
|
||||||
loadExtractor("https://embedwish.com/e/$framesrc", "$ref/", subtitleCallback, callback)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2269,10 +2262,9 @@ object SoraExtractor : SoraStream() {
|
||||||
suspend fun invokeRidomovies(
|
suspend fun invokeRidomovies(
|
||||||
tmdbId: Int? = null,
|
tmdbId: Int? = null,
|
||||||
imdbId: String? = null,
|
imdbId: String? = null,
|
||||||
title: String? = null,
|
|
||||||
callback: (ExtractorLink) -> Unit,
|
callback: (ExtractorLink) -> Unit,
|
||||||
) {
|
) {
|
||||||
val slug = app.get("$ridomoviesAPI/core/api/search?q=$title")
|
val slug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId")
|
||||||
.parsedSafe<RidoSearch>()?.data?.items?.find {
|
.parsedSafe<RidoSearch>()?.data?.items?.find {
|
||||||
it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
|
it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
|
||||||
}?.slug ?: return
|
}?.slug ?: return
|
||||||
|
|
|
@ -106,7 +106,7 @@ open class SoraStream : TmdbProvider() {
|
||||||
const val ridomoviesAPI = "https://ridomovies.pw"
|
const val ridomoviesAPI = "https://ridomovies.pw"
|
||||||
const val navyAPI = "https://navy-issue-i-239.site"
|
const val navyAPI = "https://navy-issue-i-239.site"
|
||||||
const val emoviesAPI = "https://emovies.si"
|
const val emoviesAPI = "https://emovies.si"
|
||||||
const val multimoviesAPI = "https://multimovies.info"
|
const val multimoviesAPI = "https://multimovies.live"
|
||||||
const val netmoviesAPI = "https://netmovies.to"
|
const val netmoviesAPI = "https://netmovies.to"
|
||||||
const val momentAPI = "https://izzillent-dickstonyx-i-262.site"
|
const val momentAPI = "https://izzillent-dickstonyx-i-262.site"
|
||||||
const val doomoviesAPI = "https://doomovies.net"
|
const val doomoviesAPI = "https://doomovies.net"
|
||||||
|
@ -119,7 +119,7 @@ open class SoraStream : TmdbProvider() {
|
||||||
const val dotmoviesAPI = "https://dotmovies.yachts"
|
const val dotmoviesAPI = "https://dotmovies.yachts"
|
||||||
const val blackvidAPI = "https://prod.api.blackvid.space"
|
const val blackvidAPI = "https://prod.api.blackvid.space"
|
||||||
const val showflixAPI = "https://showflix.online"
|
const val showflixAPI = "https://showflix.online"
|
||||||
const val dahmerMoviesAPI = "https://edytjedhgmdhm.abfhaqrhbnf.workers.dev"
|
const val dahmerMoviesAPI = "https://odd-bird-1319.zwuhygoaqe.workers.dev"
|
||||||
|
|
||||||
fun getType(t: String?): TvType {
|
fun getType(t: String?): TvType {
|
||||||
return when (t) {
|
return when (t) {
|
||||||
|
@ -577,7 +577,6 @@ open class SoraStream : TmdbProvider() {
|
||||||
if (!res.isAnime && res.season == null) invokeRidomovies(
|
if (!res.isAnime && res.season == null) invokeRidomovies(
|
||||||
res.id,
|
res.id,
|
||||||
res.imdbId,
|
res.imdbId,
|
||||||
res.title,
|
|
||||||
callback
|
callback
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|
|
@ -218,7 +218,6 @@ class SoraStreamLite : SoraStream() {
|
||||||
if (!res.isAnime && res.season == null) invokeRidomovies(
|
if (!res.isAnime && res.season == null) invokeRidomovies(
|
||||||
res.id,
|
res.id,
|
||||||
res.imdbId,
|
res.imdbId,
|
||||||
res.title,
|
|
||||||
callback
|
callback
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|
|
@ -26,5 +26,6 @@ class SoraStreamPlugin: Plugin() {
|
||||||
registerExtractorAPI(Streamwish())
|
registerExtractorAPI(Streamwish())
|
||||||
registerExtractorAPI(FilelionsTo())
|
registerExtractorAPI(FilelionsTo())
|
||||||
registerExtractorAPI(Embedwish())
|
registerExtractorAPI(Embedwish())
|
||||||
|
registerExtractorAPI(Wishfast())
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue