Merge remote-tracking branch 'origin/extractor'

This commit is contained in:
hexated 2022-10-22 00:44:50 +07:00
commit 1f25ff6dc0
6 changed files with 116 additions and 20 deletions

View file

@ -0,0 +1,40 @@
package com.lagradost.cloudstream3.extractors
import com.lagradost.cloudstream3.SubtitleFile
import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.M3u8Helper
class Moviehab : ExtractorApi() {
override var name = "Moviehab"
override var mainUrl = "https://play.moviehab.com"
override val requiresReferer = false
override suspend fun getUrl(
url: String,
referer: String?,
subtitleCallback: (SubtitleFile) -> Unit,
callback: (ExtractorLink) -> Unit
) {
val res = app.get(url)
res.document.select("video#player").let {
//should redirect first for making it works
val link = app.get("$mainUrl/${it.select("source").attr("src")}", referer = url).url
M3u8Helper.generateM3u8(
this.name,
link,
url
).forEach(callback)
Regex("src[\"|'],\\s[\"|'](\\S+)[\"|']\\)").find(res.text)?.groupValues?.get(1).let {sub ->
subtitleCallback.invoke(
SubtitleFile(
it.select("track").attr("label"),
"$mainUrl/$sub"
)
)
}
}
}
}

View file

@ -7,7 +7,11 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.M3u8Helper
class SpeedoStream : ExtractorApi() {
class SpeedoStream1 : SpeedoStream() {
override val mainUrl = "https://speedostream.nl"
}
open class SpeedoStream : ExtractorApi() {
override val name = "SpeedoStream"
override val mainUrl = "https://speedostream.com"
override val requiresReferer = true

View file

@ -7,6 +7,11 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.M3u8Helper
class Sbspeed : StreamSB() {
override var name = "Sbspeed"
override var mainUrl = "https://sbspeed.com"
}
class Streamsss : StreamSB() {
override var mainUrl = "https://streamsss.net"
}
@ -93,15 +98,15 @@ open class StreamSB : ExtractorApi() {
}
data class Subs (
@JsonProperty("file") val file: String,
@JsonProperty("label") val label: String,
@JsonProperty("file") val file: String? = null,
@JsonProperty("label") val label: String? = null,
)
data class StreamData (
@JsonProperty("file") val file: String,
@JsonProperty("cdn_img") val cdnImg: String,
@JsonProperty("hash") val hash: String,
@JsonProperty("subs") val subs: List<Subs>?,
@JsonProperty("subs") val subs: ArrayList<Subs>? = arrayListOf(),
@JsonProperty("length") val length: String,
@JsonProperty("id") val id: String,
@JsonProperty("title") val title: String,
@ -141,5 +146,14 @@ open class StreamSB : ExtractorApi() {
url,
headers = headers
).forEach(callback)
mapped.streamData.subs?.map {sub ->
subtitleCallback.invoke(
SubtitleFile(
sub.label.toString(),
sub.file ?: return@map null,
)
)
}
}
}

View file

@ -85,7 +85,7 @@ open class VidSrcExtractor : ExtractorApi() {
this.name,
this.name,
srcm3u8,
this.mainUrl,
"https://vidsrc.stream/",
Qualities.Unknown.value,
extractorData = pass,
isM3u8 = true

View file

@ -1,12 +1,23 @@
package com.lagradost.cloudstream3.extractors
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.SubtitleFile
import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.utils.AppUtils
import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.getQualityFromName
class Cdnplayer: XStreamCdn() {
override val name: String = "Cdnplayer"
override val mainUrl: String = "https://cdnplayer.online"
}
class Kotakajair: XStreamCdn() {
override val name: String = "Kotakajair"
override val mainUrl: String = "https://kotakajair.xyz"
}
class FEnet: XStreamCdn() {
override val name: String = "FEnet"
override val mainUrl: String = "https://fembed.net"
@ -59,44 +70,66 @@ open class XStreamCdn : ExtractorApi() {
//val type: String // Mp4
)
private data class Player(
@JsonProperty("poster_file") val poster_file: String? = null,
)
private data class ResponseJson(
@JsonProperty("success") val success: Boolean,
@JsonProperty("data") val data: List<ResponseData>?
@JsonProperty("player") val player: Player? = null,
@JsonProperty("data") val data: List<ResponseData>?,
@JsonProperty("captions") val captions: List<Captions>?,
)
private data class Captions(
@JsonProperty("id") val id: String,
@JsonProperty("hash") val hash: String,
@JsonProperty("language") val language: String,
)
override fun getExtractorUrl(id: String): String {
return "$domainUrl/api/source/$id"
}
override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
override suspend fun getUrl(
url: String,
referer: String?,
subtitleCallback: (SubtitleFile) -> Unit,
callback: (ExtractorLink) -> Unit
) {
val headers = mapOf(
"Referer" to url,
"User-Agent" to "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0",
)
val id = url.trimEnd('/').split("/").last()
val newUrl = "https://${domainUrl}/api/source/${id}"
val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
with(app.post(newUrl, headers = headers)) {
if (this.code != 200) return listOf()
val text = this.text
if (text.isEmpty()) return listOf()
if (text == """{"success":false,"data":"Video not found or has been removed"}""") return listOf()
AppUtils.parseJson<ResponseJson?>(text)?.let {
app.post(newUrl, headers = headers).let { res ->
val sources = tryParseJson<ResponseJson?>(res.text)
sources?.let {
if (it.success && it.data != null) {
it.data.forEach { data ->
extractedLinksList.add(
it.data.map { source ->
callback.invoke(
ExtractorLink(
name,
name = name,
data.file,
source.file,
url,
getQualityFromName(data.label),
getQualityFromName(source.label),
)
)
}
}
}
val userData = sources?.player?.poster_file?.split("/")?.get(2)
sources?.captions?.map {
subtitleCallback.invoke(
SubtitleFile(
it.language,
"$mainUrl/asset/userdata/$userData/caption/${it.hash}/${it.id}.srt"
)
)
}
}
return extractedLinksList
}
}

View file

@ -235,6 +235,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
Vidgomunime(),
Sbflix(),
Streamsss(),
Sbspeed(),
Fastream(),
@ -246,6 +247,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
LayarKaca(),
Rasacintaku(),
FEnet(),
Kotakajair(),
Cdnplayer(),
// WatchSB(), 'cause StreamSB.kt works
Uqload(),
Uqload1(),
@ -317,6 +320,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
Linkbox(),
Acefile(),
SpeedoStream(),
SpeedoStream1(),
Zorofile(),
Embedgram(),
Mvidoo(),
@ -324,6 +328,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
Vidmoly(),
Vidmolyme(),
Voe(),
Moviehab(),
Gdriveplayerapi(),
Gdriveplayerapp(),