MohmedIbrahim/cloudstream
1
0
Fork 0
forked from recloudstream/cloudstream
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed Vidstream extractor

Browse source
This commit is contained in:
LagradOst 2021-12-25 19:54:44 +01:00
parent 251da7d157
commit 9d2e924ac1
3 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/lagradost/cloudstream3/extractors/SBPlay.kt
View file

@ -9,7 +9,11 @@ import com.lagradost.cloudstream3.utils.Qualities
import com.lagradost.cloudstream3.utils.getPostForm import com.lagradost.cloudstream3.utils.getPostForm
import org.jsoup.Jsoup import org.jsoup.Jsoup
class SBPlay : ExtractorApi() { class SBPlay2 : SBPlay() {
override val mainUrl = "https://sbplay2.com"
}
open class SBPlay : ExtractorApi() {
override val mainUrl = "https://sbplay.one" override val mainUrl = "https://sbplay.one"
override val name = "SBPlay" override val name = "SBPlay"
override val requiresReferer = false override val requiresReferer = false

17
app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt
View file

@ -2,12 +2,11 @@ package com.lagradost.cloudstream3.extractors
import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
import com.lagradost.cloudstream3.network.text
import com.lagradost.cloudstream3.network.url
import com.lagradost.cloudstream3.pmap import com.lagradost.cloudstream3.pmap
import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.extractorApis import com.lagradost.cloudstream3.utils.extractorApis
import com.lagradost.cloudstream3.utils.getQualityFromName import com.lagradost.cloudstream3.utils.getQualityFromName
import com.lagradost.cloudstream3.utils.loadExtractor
import org.jsoup.Jsoup import org.jsoup.Jsoup
/** /**
@ -46,23 +45,27 @@ class Vidstream(val mainUrl: String) {
val pageDoc = Jsoup.parse(page.text) val pageDoc = Jsoup.parse(page.text)
val qualityRegex = Regex("(\\d+)P") val qualityRegex = Regex("(\\d+)P")
pageDoc.select(".dowload > a[download]").forEach { //a[download]
val qual = if (it.text() pageDoc.select(".dowload > a")?.pmap { element ->
val href = element.attr("href") ?: return@pmap
val qual = if (element.text()
.contains("HDP") .contains("HDP")
) "1080" else qualityRegex.find(it.text())?.destructured?.component1().toString() ) "1080" else qualityRegex.find(element.text())?.destructured?.component1().toString()
if (!loadExtractor(href, link, callback)) {
callback.invoke( callback.invoke(
ExtractorLink( ExtractorLink(
this.name, this.name,
if (qual == "null") this.name else "${this.name} - " + qual + "p", if (qual == "null") this.name else "${this.name} - " + qual + "p",
it.attr("href"), href,
page.url, page.url,
getQualityFromName(qual), getQualityFromName(qual),
it.attr("href").contains(".m3u8") element.attr("href").contains(".m3u8")
) )
) )
} }
} }
}
with(app.get(extractorUrl)) { with(app.get(extractorUrl)) {
val document = Jsoup.parse(this.text) val document = Jsoup.parse(this.text)

8
app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt
View file

@ -4,7 +4,6 @@ import com.lagradost.cloudstream3.USER_AGENT
import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.extractors.* import com.lagradost.cloudstream3.extractors.*
import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
import com.lagradost.cloudstream3.network.text
import org.jsoup.Jsoup import org.jsoup.Jsoup
data class ExtractorLink( data class ExtractorLink(
@ -80,7 +79,7 @@ val extractorApis: Array<ExtractorApi> = arrayOf(
XStreamCdn(), XStreamCdn(),
StreamSB(), StreamSB(),
Streamhub(), Streamhub(),
SBPlay(),
FEmbed(), FEmbed(),
WatchSB(), WatchSB(),
VoeExtractor(), VoeExtractor(),
@ -91,7 +90,10 @@ val extractorApis: Array<ExtractorApi> = arrayOf(
DoodSoExtractor(), DoodSoExtractor(),
DoodLaExtractor(), DoodLaExtractor(),
AsianLoad() AsianLoad(),
SBPlay(),
SBPlay2(),
) )
fun getExtractorApiFromName(name: String): ExtractorApi { fun getExtractorApiFromName(name: String): ExtractorApi {