mirror of
				https://github.com/recloudstream/cloudstream.git
				synced 2024-08-15 01:53:11 +00:00 
			
		
		
		
	* cleanup on fembed class * additional fixes * additional cleanup on xstreamcdn extractor
This commit is contained in:
		
							parent
							
								
									df96064c76
								
							
						
					
					
						commit
						478b7a0066
					
				
					 11 changed files with 27 additions and 55 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
                                )
 | 
			
		||||
                            )
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
                ))
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
                ))
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
                                )
 | 
			
		||||
                            )
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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]),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue