Fix dependencies on other plugins causing errors

This commit is contained in:
Blatzar 2022-08-11 01:05:19 +02:00
parent 62f5d8258f
commit b74b8614db
62 changed files with 94 additions and 488 deletions

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":VidstreamProviderTemplate")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class AsianLoadProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(AsianLoadProvider())
}
}

View file

@ -1,26 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":SflixProvider")))
// implementation(project(mapOf("path" to ":SflixProvider")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class DopeboxProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(DopeboxProvider())
}
}

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":VidstreamProviderTemplate")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class DramaSeeProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(DramaSeeProvider())
}
}

View file

@ -1,26 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":WatchAsianProvider")))
implementation(project(mapOf("path" to ":WatchAsianProvider")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class KdramaHoodProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(KdramaHoodProvider())
}
}

View file

@ -1,26 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":VidstreamProviderTemplate")))
implementation(project(mapOf("path" to ":VidEmbedProvider")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class OpenVidsProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(OpenVidsProvider())
}
}

View file

@ -1,6 +1,3 @@
dependencies {
implementation(project(mapOf("path" to ":PelisplusProviderTemplate")))
}
// use an integer for version numbers // use an integer for version numbers
version = 1 version = 1

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class PelisplusProviderTemplatePlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(PelisplusProviderTemplate())
}
}

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":WatchAsianProvider")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -5,7 +5,7 @@ version = 1
cloudstream { cloudstream {
// All of these properties are optional, you can safely remove them // All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum" description = "Includes PinoyMoviePediaProvider and PinoyMoviesEsProvider"
// authors = listOf("Cloudburst") // authors = listOf("Cloudburst")
/** /**

View file

@ -225,8 +225,7 @@ class PinoyMoviePediaProvider : MainAPI() {
tryParseJson<List<String>>(data)?.apmap { link -> tryParseJson<List<String>>(data)?.apmap { link ->
count++ count++
if (link.contains("fembed.com")) { if (link.contains("fembed.com")) {
val extractor = FEmbed() val extractor = Diasfem()
extractor.domainUrl = "diasfem.com"
extractor.getUrl(data).forEach { extractor.getUrl(data).forEach {
callback.invoke(it) callback.invoke(it)
} }

View file

@ -1,4 +1,3 @@
package com.lagradost package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
@ -10,5 +9,8 @@ class PinoyMoviePediaProviderPlugin: Plugin() {
override fun load(context: Context) { override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly. // All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(PinoyMoviePediaProvider()) registerMainAPI(PinoyMoviePediaProvider())
registerMainAPI(PinoyMoviesEsProvider())
registerExtractorAPI(Diasfem())
registerExtractorAPI(XStreamCdn())
} }
} }

View file

@ -235,8 +235,7 @@ class PinoyMoviesEsProvider : MainAPI() {
VstreamhubHelper.getUrls(link, subtitleCallback, callback) VstreamhubHelper.getUrls(link, subtitleCallback, callback)
count++ count++
} else if (link.contains("fembed.com")) { } else if (link.contains("fembed.com")) {
val extractor = FEmbed() val extractor = Diasfem()
extractor.domainUrl = "diasfem.com"
extractor.getUrl(data).forEach { extractor.getUrl(data).forEach {
callback.invoke(it) callback.invoke(it)
count++ count++

View file

@ -0,0 +1,68 @@
package com.lagradost
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.utils.AppUtils
import com.lagradost.cloudstream3.utils.ExtractorApi
import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.getQualityFromName
class Diasfem: XStreamCdn() {
override val name: String = "Diasfem"
override val mainUrl: String = "https://diasfem.com"
override var domainUrl: String = "diasfem.com"
}
open class XStreamCdn : ExtractorApi() {
override val name: String = "XStreamCdn"
override val mainUrl: String = "https://embedsito.com"
override val requiresReferer = false
open var domainUrl: String = "embedsito.com"
private data class ResponseData(
@JsonProperty("file") val file: String,
@JsonProperty("label") val label: String,
//val type: String // Mp4
)
private data class ResponseJson(
@JsonProperty("success") val success: Boolean,
@JsonProperty("data") val data: List<ResponseData>?
)
override fun getExtractorUrl(id: String): String {
return "$domainUrl/api/source/$id"
}
override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
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 {
if (it.success && it.data != null) {
it.data.forEach { data ->
extractedLinksList.add(
ExtractorLink(
name,
name = name,
data.file,
url,
getQualityFromName(data.label),
)
)
}
}
}
}
return extractedLinksList
}
}

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":WatchAsianProvider")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class PinoyMoviesEsProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(PinoyMoviesEsProvider())
}
}

View file

@ -5,7 +5,7 @@ version = 1
cloudstream { cloudstream {
// All of these properties are optional, you can safely remove them // All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum" description = "Also includes Dopebox, Solarmovie and 2embed"
// authors = listOf("Cloudburst") // authors = listOf("Cloudburst")
/** /**

View file

@ -1,4 +1,3 @@
package com.lagradost package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
@ -10,5 +9,8 @@ class SflixProviderPlugin: Plugin() {
override fun load(context: Context) { override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly. // All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(SflixProvider()) registerMainAPI(SflixProvider())
registerMainAPI(SolarmovieProvider())
registerMainAPI(TwoEmbedProvider())
registerMainAPI(DopeboxProvider())
} }
} }

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":SflixProvider")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class SolarmovieProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(SolarmovieProvider())
}
}

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":SflixProvider")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class TwoEmbedProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(TwoEmbedProvider())
}
}

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":VidstreamProviderTemplate")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,14 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
class VidEmbedProviderPlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(VidEmbedProvider())
}
}

View file

@ -5,7 +5,7 @@ version = 1
cloudstream { cloudstream {
// All of these properties are optional, you can safely remove them // All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum" description = "Includes many providers with the same layout as Vidstream"
// authors = listOf("Cloudburst") // authors = listOf("Cloudburst")
/** /**

View file

@ -273,10 +273,10 @@ class KdramaHoodProvider : MainAPI() {
//Log.i(this.name, "Result => (url) $url") //Log.i(this.name, "Result => (url) $url")
when { when {
url.startsWith("https://asianembed.io") -> { url.startsWith("https://asianembed.io") -> {
AsianEmbedHelper.getUrls(url, subtitleCallback, callback) com.lagradost.AsianEmbedHelper.getUrls(url, subtitleCallback, callback)
} }
url.startsWith("https://embedsito.com") -> { url.startsWith("https://embedsito.com") -> {
val extractor = XStreamCdn() val extractor = com.lagradost.XStreamCdn()
extractor.domainUrl = "embedsito.com" extractor.domainUrl = "embedsito.com"
extractor.getUrl(url).forEach { link -> extractor.getUrl(url).forEach { link ->
callback.invoke(link) callback.invoke(link)

View file

@ -1,15 +1,15 @@
package com.lagradost package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context import android.content.Context
import com.lagradost.cloudstream3.extractors.Vidstream
@CloudstreamPlugin @CloudstreamPlugin
class WatchAsianProviderPlugin: Plugin() { class VidstreamBundlePlugin : Plugin() {
override fun load(context: Context) { override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly. // All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(WatchAsianProvider()) registerExtractorAPI(MultiQuality())
registerExtractorAPI(XStreamCdn()) registerExtractorAPI(XStreamCdn())
registerExtractorAPI(LayarKaca()) registerExtractorAPI(LayarKaca())
registerExtractorAPI(DBfilm()) registerExtractorAPI(DBfilm())
@ -17,5 +17,11 @@ class WatchAsianProviderPlugin: Plugin() {
registerExtractorAPI(FEmbed()) registerExtractorAPI(FEmbed())
registerExtractorAPI(Fplayer()) registerExtractorAPI(Fplayer())
registerExtractorAPI(FeHD()) registerExtractorAPI(FeHD())
registerMainAPI(VidEmbedProvider())
registerMainAPI(OpenVidsProvider())
registerMainAPI(KdramaHoodProvider())
registerMainAPI(DramaSeeProvider())
registerMainAPI(AsianLoadProvider())
registerMainAPI(WatchAsianProvider())
} }
} }

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -1,16 +0,0 @@
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
import com.lagradost.cloudstream3.extractors.Vidstream
@CloudstreamPlugin
class VidstreamProviderTemplatePlugin: Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerExtractorAPI(MultiQuality())
registerMainAPI(VidstreamProviderTemplate())
}
}

View file

@ -1,25 +0,0 @@
dependencies {
implementation(project(mapOf("path" to ":VidstreamProviderTemplate")))
}
// use an integer for version numbers
version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
// description = "Lorem Ipsum"
// authors = listOf("Cloudburst")
/**
* Status int as the following:
* 0: Down
* 1: Ok
* 2: Slow
* 3: Beta only
* */
status = 1 // will be 3 if unspecified
// Set to true to get an 18+ symbol next to the plugin
adult = false // will be false if unspecified
}

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.lagradost"/>

View file

@ -12,13 +12,11 @@ include(
"AsiaFlixProvider", "AsiaFlixProvider",
"DoramasYTProvider", "DoramasYTProvider",
// "SflixProProvider", // "SflixProProvider",
"PinoyMoviePediaProvider", "PinoyMovies",
"SeriesflixProvider", "SeriesflixProvider",
"TrailersTwoProvider", "TrailersTwoProvider",
"PinoyMoviesEsProvider",
"KisskhProvider", "KisskhProvider",
"DramaSeeProvider", "VidstreamBundle",
"VidstreamProviderTemplate",
"RebahinProvider", "RebahinProvider",
"AllMoviesForYouProvider", "AllMoviesForYouProvider",
"UakinoProvider", "UakinoProvider",
@ -26,10 +24,8 @@ include(
"FaselHDProvider", "FaselHDProvider",
"MeloMovieProvider", "MeloMovieProvider",
"PelisplusProvider", "PelisplusProvider",
"AsianLoadProvider",
"YomoviesProvider", "YomoviesProvider",
"AkwamProvider", "AkwamProvider",
"VidEmbedProvider",
"IdlixProvider", "IdlixProvider",
"NginxProvider", "NginxProvider",
"SoaptwoDayProvider", "SoaptwoDayProvider",
@ -40,27 +36,21 @@ include(
"ElifilmsProvider", "ElifilmsProvider",
"VidSrcProvider", "VidSrcProvider",
"EgyBestProvider", "EgyBestProvider",
"WatchAsianProvider",
"VfSerieProvider", "VfSerieProvider",
"LayarKacaProvider", "LayarKacaProvider",
"EntrepeliculasyseriesProvider", "EntrepeliculasyseriesProvider",
"TantiFilmProvider", "TantiFilmProvider",
"TwoEmbedProvider",
"SuperStream", "SuperStream",
"FilmpertuttiProvider", "FilmpertuttiProvider",
"FrenchStreamProvider", "FrenchStreamProvider",
"KdramaHoodProvider",
"MyCimaProvider", "MyCimaProvider",
"IlGenioDelloStreamingProvider", "IlGenioDelloStreamingProvider",
"EstrenosDoramasProvider", "EstrenosDoramasProvider",
// "HDTodayProvider", // "HDTodayProvider",
"DopeboxProvider",
"DubokuProvider", "DubokuProvider",
"HDMProvider", "HDMProvider",
"PhimmoichillProvider", "PhimmoichillProvider",
"PelisplusProviderTemplate",
"OlgplyProvider", "OlgplyProvider",
"SolarmovieProvider",
"PeliSmartProvider", "PeliSmartProvider",
"VfFilmProvider", "VfFilmProvider",
"IHaveNoTvProvider", "IHaveNoTvProvider",
@ -70,7 +60,6 @@ include(
"HDrezkaProvider", "HDrezkaProvider",
"PelisplusHDProvider", "PelisplusHDProvider",
"MultiplexProvider", "MultiplexProvider",
"OpenVidsProvider",
//"BflixProvider", //"BflixProvider",
// "FmoviesToProvider", // "FmoviesToProvider",
"TheFlixToProvider", "TheFlixToProvider",