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

[Fix] Additional Extractor fixes related to #954 (#956)

Browse source 
* cleanup on fembed class

* additional fixes

* additional cleanup on xstreamcdn extractor
This commit is contained in:
Jace 2022-04-16 10:51:56 +08:00 • committed by GitHub
parent df96064c76
commit 478b7a0066
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 27 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt
View file

@ -24,14 +24,13 @@ class AsianLoad : ExtractorApi() {
), true
)
.forEach { stream ->
val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
extractedLinksList.add(
ExtractorLink(
name,
"$name $qualityString",
name = name,
stream.streamUrl,
url,
getQualityFromName(stream.quality.toString()),
getQualityFromName(stream.quality?.toString()),
true
)
)

13
app/src/main/java/com/lagradost/cloudstream3/extractors/FEmbed.kt
View file

@ -1,13 +0,0 @@
package com.lagradost.cloudstream3.extractors
import android.util.Log
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.module.kotlin.readValue
import com.lagradost.cloudstream3.network.Session
import com.lagradost.cloudstream3.utils.*
import com.lagradost.cloudstream3.mapper
class FEmbed: XStreamCdn() {
override val name: String = "FEmbed"
override val mainUrl: String = "https://www.fembed.com"
}

14
app/src/main/java/com/lagradost/cloudstream3/extractors/FeHD.kt
View file

@ -1,14 +0,0 @@
package com.lagradost.cloudstream3.extractors
import android.util.Log
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.module.kotlin.readValue
import com.lagradost.cloudstream3.network.Session
import com.lagradost.cloudstream3.utils.*
import com.lagradost.cloudstream3.mapper
class FeHD: XStreamCdn() {
override val name: String = "FeHD"
override val mainUrl: String = "https://fembed-hd.com"
override var domainUrl: String = "fembed-hd.com"
}

13
app/src/main/java/com/lagradost/cloudstream3/extractors/Fplayer.kt
View file

@ -1,13 +0,0 @@
package com.lagradost.cloudstream3.extractors
import android.util.Log
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.module.kotlin.readValue
import com.lagradost.cloudstream3.network.Session
import com.lagradost.cloudstream3.utils.*
import com.lagradost.cloudstream3.mapper
class Fplayer: XStreamCdn() {
override val name: String = "Fplayer"
override val mainUrl: String = "https://fplayer.info"
}

5
app/src/main/java/com/lagradost/cloudstream3/extractors/GenericM3U8.kt
View file

@ -30,13 +30,12 @@ open class GenericM3U8 : ExtractorApi() {
), true
)
.map { stream ->
val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
sources.add( ExtractorLink(
name,
"$name $qualityString",
name = name,
stream.streamUrl,
url,
getQualityFromName(stream.quality.toString()),
getQualityFromName(stream.quality?.toString()),
true
))
}

5
app/src/main/java/com/lagradost/cloudstream3/extractors/Jawcloud.kt
View file

@ -21,13 +21,12 @@ open class Jawcloud : ExtractorApi() {
), true
)
.map { stream ->
val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
sources.add( ExtractorLink(
name,
"$name $qualityString",
name = name,
stream.streamUrl,
url,
getQualityFromName(stream.quality.toString()),
getQualityFromName(stream.quality?.toString()),
true
))
}

5
app/src/main/java/com/lagradost/cloudstream3/extractors/Mcloud.kt
View file

@ -63,14 +63,13 @@ open class Mcloud : ExtractorApi() {
), true
)
.map { stream ->
val qualityString = if ((stream.quality ?: 0) == 0) "" else "${stream.quality}p"
sources.add(
ExtractorLink(
name,
"$name $qualityString",
name = name,
stream.streamUrl,
url,
getQualityFromName(stream.quality.toString()),
getQualityFromName(stream.quality?.toString()),
true
)
)

2
app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt
View file

@ -31,7 +31,7 @@ class MultiQuality : ExtractorApi() {
extractedLinksList.add(
ExtractorLink(
name,
"$name ${match.groupValues[1]}p",
name = name,
urlRegex.find(this.url)!!.groupValues[1] + match.groupValues[0],
url,
getQualityFromName(match.groupValues[1]),

2
app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
View file

@ -50,7 +50,7 @@ open class OkRu : ExtractorApi() {
val extractedurl = it.url.replace("\\\\u0026", "&")
sources.add(ExtractorLink(
name,
"$name $quality",
name = this.name,
extractedurl,
url,
getQualityFromName(quality),

2
app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt
View file

@ -56,7 +56,7 @@ class Pelisplus(val mainUrl: String) {
callback.invoke(
ExtractorLink(
this.name,
if (qual == "null") this.name else "${this.name} - " + qual + "p",
name = this.name,
href,
page.url,
getQualityFromName(qual),

16
app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
View file

@ -8,6 +8,22 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.getQualityFromName
class FEmbed: XStreamCdn() {
override val name: String = "FEmbed"
override val mainUrl: String = "https://www.fembed.com"
}
class Fplayer: XStreamCdn() {
override val name: String = "Fplayer"
override val mainUrl: String = "https://fplayer.info"
}
class FeHD: XStreamCdn() {
override val name: String = "FeHD"
override val mainUrl: String = "https://fembed-hd.com"
override var domainUrl: String = "fembed-hd.com"
}
open class XStreamCdn : ExtractorApi() {
override val name: String = "XStreamCdn"
override val mainUrl: String = "https://embedsito.com"