diff --git a/AsianLoadProvider/build.gradle.kts b/AsianLoadProvider/build.gradle.kts
deleted file mode 100644
index df3927d..0000000
--- a/AsianLoadProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/AsianLoadProvider/src/main/kotlin/com/lagradost/AsianLoadProviderPlugin.kt b/AsianLoadProvider/src/main/kotlin/com/lagradost/AsianLoadProviderPlugin.kt
deleted file mode 100644
index 09cfea2..0000000
--- a/AsianLoadProvider/src/main/kotlin/com/lagradost/AsianLoadProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/DopeboxProvider/build.gradle.kts b/DopeboxProvider/build.gradle.kts
deleted file mode 100644
index 9d974c3..0000000
--- a/DopeboxProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/DopeboxProvider/src/main/kotlin/com/lagradost/DopeboxProviderPlugin.kt b/DopeboxProvider/src/main/kotlin/com/lagradost/DopeboxProviderPlugin.kt
deleted file mode 100644
index 431e308..0000000
--- a/DopeboxProvider/src/main/kotlin/com/lagradost/DopeboxProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/DramaSeeProvider/build.gradle.kts b/DramaSeeProvider/build.gradle.kts
deleted file mode 100644
index df3927d..0000000
--- a/DramaSeeProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/DramaSeeProvider/src/main/AndroidManifest.xml b/DramaSeeProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/DramaSeeProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/DramaSeeProvider/src/main/kotlin/com/lagradost/DramaSeeProviderPlugin.kt b/DramaSeeProvider/src/main/kotlin/com/lagradost/DramaSeeProviderPlugin.kt
deleted file mode 100644
index ea2b88a..0000000
--- a/DramaSeeProvider/src/main/kotlin/com/lagradost/DramaSeeProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/KdramaHoodProvider/build.gradle.kts b/KdramaHoodProvider/build.gradle.kts
deleted file mode 100644
index 91a4840..0000000
--- a/KdramaHoodProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/KdramaHoodProvider/src/main/AndroidManifest.xml b/KdramaHoodProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/KdramaHoodProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/KdramaHoodProvider/src/main/kotlin/com/lagradost/KdramaHoodProviderPlugin.kt b/KdramaHoodProvider/src/main/kotlin/com/lagradost/KdramaHoodProviderPlugin.kt
deleted file mode 100644
index 338a2f4..0000000
--- a/KdramaHoodProvider/src/main/kotlin/com/lagradost/KdramaHoodProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/OpenVidsProvider/build.gradle.kts b/OpenVidsProvider/build.gradle.kts
deleted file mode 100644
index c5b221c..0000000
--- a/OpenVidsProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/OpenVidsProvider/src/main/AndroidManifest.xml b/OpenVidsProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/OpenVidsProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/OpenVidsProvider/src/main/kotlin/com/lagradost/OpenVidsProviderPlugin.kt b/OpenVidsProvider/src/main/kotlin/com/lagradost/OpenVidsProviderPlugin.kt
deleted file mode 100644
index 94f1564..0000000
--- a/OpenVidsProvider/src/main/kotlin/com/lagradost/OpenVidsProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/PelisplusProvider/build.gradle.kts b/PelisplusProvider/build.gradle.kts
index 9822edc..e7d2158 100644
--- a/PelisplusProvider/build.gradle.kts
+++ b/PelisplusProvider/build.gradle.kts
@@ -1,6 +1,3 @@
-dependencies {
- implementation(project(mapOf("path" to ":PelisplusProviderTemplate")))
-}
// use an integer for version numbers
version = 1
diff --git a/PelisplusProviderTemplate/src/main/kotlin/com/lagradost/PelisplusProviderTemplate.kt b/PelisplusProvider/src/main/kotlin/com/lagradost/PelisplusProviderTemplate.kt
similarity index 100%
rename from PelisplusProviderTemplate/src/main/kotlin/com/lagradost/PelisplusProviderTemplate.kt
rename to PelisplusProvider/src/main/kotlin/com/lagradost/PelisplusProviderTemplate.kt
diff --git a/PelisplusProviderTemplate/src/main/AndroidManifest.xml b/PelisplusProviderTemplate/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/PelisplusProviderTemplate/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/PelisplusProviderTemplate/src/main/kotlin/com/lagradost/PelisplusProviderTemplatePlugin.kt b/PelisplusProviderTemplate/src/main/kotlin/com/lagradost/PelisplusProviderTemplatePlugin.kt
deleted file mode 100644
index 47e993d..0000000
--- a/PelisplusProviderTemplate/src/main/kotlin/com/lagradost/PelisplusProviderTemplatePlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/PinoyMoviePediaProvider/build.gradle.kts b/PinoyMoviePediaProvider/build.gradle.kts
deleted file mode 100644
index 871010c..0000000
--- a/PinoyMoviePediaProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/PinoyMoviePediaProvider/src/main/AndroidManifest.xml b/PinoyMoviePediaProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/PinoyMoviePediaProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/PelisplusProviderTemplate/build.gradle.kts b/PinoyMovies/build.gradle.kts
similarity index 84%
rename from PelisplusProviderTemplate/build.gradle.kts
rename to PinoyMovies/build.gradle.kts
index e7d2158..0f8c245 100644
--- a/PelisplusProviderTemplate/build.gradle.kts
+++ b/PinoyMovies/build.gradle.kts
@@ -5,7 +5,7 @@ version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
- // description = "Lorem Ipsum"
+ description = "Includes PinoyMoviePediaProvider and PinoyMoviesEsProvider"
// authors = listOf("Cloudburst")
/**
diff --git a/AsianLoadProvider/src/main/AndroidManifest.xml b/PinoyMovies/src/main/AndroidManifest.xml
similarity index 100%
rename from AsianLoadProvider/src/main/AndroidManifest.xml
rename to PinoyMovies/src/main/AndroidManifest.xml
diff --git a/PinoyMoviePediaProvider/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt
similarity index 99%
rename from PinoyMoviePediaProvider/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt
rename to PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt
index 9a23a32..8448701 100644
--- a/PinoyMoviePediaProvider/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt
+++ b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt
@@ -225,8 +225,7 @@ class PinoyMoviePediaProvider : MainAPI() {
tryParseJson>(data)?.apmap { link ->
count++
if (link.contains("fembed.com")) {
- val extractor = FEmbed()
- extractor.domainUrl = "diasfem.com"
+ val extractor = Diasfem()
extractor.getUrl(data).forEach {
callback.invoke(it)
}
diff --git a/PinoyMoviePediaProvider/src/main/kotlin/com/lagradost/PinoyMoviePediaProviderPlugin.kt b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProviderPlugin.kt
similarity index 67%
rename from PinoyMoviePediaProvider/src/main/kotlin/com/lagradost/PinoyMoviePediaProviderPlugin.kt
rename to PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProviderPlugin.kt
index 827bda2..5d2efde 100644
--- a/PinoyMoviePediaProvider/src/main/kotlin/com/lagradost/PinoyMoviePediaProviderPlugin.kt
+++ b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProviderPlugin.kt
@@ -1,4 +1,3 @@
-
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
@@ -6,9 +5,12 @@ import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
-class PinoyMoviePediaProviderPlugin: Plugin() {
+class PinoyMoviePediaProviderPlugin : Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(PinoyMoviePediaProvider())
+ registerMainAPI(PinoyMoviesEsProvider())
+ registerExtractorAPI(Diasfem())
+ registerExtractorAPI(XStreamCdn())
}
}
\ No newline at end of file
diff --git a/PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt
similarity index 99%
rename from PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt
rename to PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt
index 9c13f59..f614269 100644
--- a/PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt
+++ b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt
@@ -235,8 +235,7 @@ class PinoyMoviesEsProvider : MainAPI() {
VstreamhubHelper.getUrls(link, subtitleCallback, callback)
count++
} else if (link.contains("fembed.com")) {
- val extractor = FEmbed()
- extractor.domainUrl = "diasfem.com"
+ val extractor = Diasfem()
extractor.getUrl(data).forEach {
callback.invoke(it)
count++
diff --git a/PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/VstreamhubHelper.kt b/PinoyMovies/src/main/kotlin/com/lagradost/VstreamhubHelper.kt
similarity index 100%
rename from PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/VstreamhubHelper.kt
rename to PinoyMovies/src/main/kotlin/com/lagradost/VstreamhubHelper.kt
diff --git a/PinoyMovies/src/main/kotlin/com/lagradost/XStreamCdn.kt b/PinoyMovies/src/main/kotlin/com/lagradost/XStreamCdn.kt
new file mode 100644
index 0000000..2abc2e3
--- /dev/null
+++ b/PinoyMovies/src/main/kotlin/com/lagradost/XStreamCdn.kt
@@ -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?
+ )
+
+ override fun getExtractorUrl(id: String): String {
+ return "$domainUrl/api/source/$id"
+ }
+
+ override suspend fun getUrl(url: String, referer: String?): List {
+ 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 = 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(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
+ }
+}
\ No newline at end of file
diff --git a/PinoyMoviesEsProvider/build.gradle.kts b/PinoyMoviesEsProvider/build.gradle.kts
deleted file mode 100644
index 871010c..0000000
--- a/PinoyMoviesEsProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/PinoyMoviesEsProvider/src/main/AndroidManifest.xml b/PinoyMoviesEsProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/PinoyMoviesEsProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/PinoyMoviesEsProviderPlugin.kt b/PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/PinoyMoviesEsProviderPlugin.kt
deleted file mode 100644
index 1e9a930..0000000
--- a/PinoyMoviesEsProvider/src/main/kotlin/com/lagradost/PinoyMoviesEsProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/SflixProvider/build.gradle.kts b/SflixProvider/build.gradle.kts
index e7d2158..76988f8 100644
--- a/SflixProvider/build.gradle.kts
+++ b/SflixProvider/build.gradle.kts
@@ -5,7 +5,7 @@ version = 1
cloudstream {
// All of these properties are optional, you can safely remove them
- // description = "Lorem Ipsum"
+ description = "Also includes Dopebox, Solarmovie and 2embed"
// authors = listOf("Cloudburst")
/**
diff --git a/DopeboxProvider/src/main/kotlin/com/lagradost/DopeboxProvider.kt b/SflixProvider/src/main/kotlin/com/lagradost/DopeboxProvider.kt
similarity index 100%
rename from DopeboxProvider/src/main/kotlin/com/lagradost/DopeboxProvider.kt
rename to SflixProvider/src/main/kotlin/com/lagradost/DopeboxProvider.kt
diff --git a/SflixProvider/src/main/kotlin/com/lagradost/SflixProviderPlugin.kt b/SflixProvider/src/main/kotlin/com/lagradost/SflixProviderPlugin.kt
index 3a5d954..d977cb4 100644
--- a/SflixProvider/src/main/kotlin/com/lagradost/SflixProviderPlugin.kt
+++ b/SflixProvider/src/main/kotlin/com/lagradost/SflixProviderPlugin.kt
@@ -1,4 +1,3 @@
-
package com.lagradost
import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
@@ -6,9 +5,12 @@ import com.lagradost.cloudstream3.plugins.Plugin
import android.content.Context
@CloudstreamPlugin
-class SflixProviderPlugin: Plugin() {
+class SflixProviderPlugin : Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
registerMainAPI(SflixProvider())
+ registerMainAPI(SolarmovieProvider())
+ registerMainAPI(TwoEmbedProvider())
+ registerMainAPI(DopeboxProvider())
}
}
\ No newline at end of file
diff --git a/SolarmovieProvider/src/main/kotlin/com/lagradost/SolarmovieProvider.kt b/SflixProvider/src/main/kotlin/com/lagradost/SolarmovieProvider.kt
similarity index 100%
rename from SolarmovieProvider/src/main/kotlin/com/lagradost/SolarmovieProvider.kt
rename to SflixProvider/src/main/kotlin/com/lagradost/SolarmovieProvider.kt
diff --git a/TwoEmbedProvider/src/main/kotlin/com/lagradost/TwoEmbedProvider.kt b/SflixProvider/src/main/kotlin/com/lagradost/TwoEmbedProvider.kt
similarity index 100%
rename from TwoEmbedProvider/src/main/kotlin/com/lagradost/TwoEmbedProvider.kt
rename to SflixProvider/src/main/kotlin/com/lagradost/TwoEmbedProvider.kt
diff --git a/SolarmovieProvider/build.gradle.kts b/SolarmovieProvider/build.gradle.kts
deleted file mode 100644
index ce4f6b5..0000000
--- a/SolarmovieProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/SolarmovieProvider/src/main/AndroidManifest.xml b/SolarmovieProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/SolarmovieProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/SolarmovieProvider/src/main/kotlin/com/lagradost/SolarmovieProviderPlugin.kt b/SolarmovieProvider/src/main/kotlin/com/lagradost/SolarmovieProviderPlugin.kt
deleted file mode 100644
index 07ae119..0000000
--- a/SolarmovieProvider/src/main/kotlin/com/lagradost/SolarmovieProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/TwoEmbedProvider/build.gradle.kts b/TwoEmbedProvider/build.gradle.kts
deleted file mode 100644
index ce4f6b5..0000000
--- a/TwoEmbedProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/TwoEmbedProvider/src/main/AndroidManifest.xml b/TwoEmbedProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/TwoEmbedProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TwoEmbedProvider/src/main/kotlin/com/lagradost/TwoEmbedProviderPlugin.kt b/TwoEmbedProvider/src/main/kotlin/com/lagradost/TwoEmbedProviderPlugin.kt
deleted file mode 100644
index 88f8190..0000000
--- a/TwoEmbedProvider/src/main/kotlin/com/lagradost/TwoEmbedProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/VidEmbedProvider/build.gradle.kts b/VidEmbedProvider/build.gradle.kts
deleted file mode 100644
index df3927d..0000000
--- a/VidEmbedProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/VidEmbedProvider/src/main/AndroidManifest.xml b/VidEmbedProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/VidEmbedProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/VidEmbedProvider/src/main/kotlin/com/lagradost/VidEmbedProviderPlugin.kt b/VidEmbedProvider/src/main/kotlin/com/lagradost/VidEmbedProviderPlugin.kt
deleted file mode 100644
index e562c7e..0000000
--- a/VidEmbedProvider/src/main/kotlin/com/lagradost/VidEmbedProviderPlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/VidstreamProviderTemplate/build.gradle.kts b/VidstreamBundle/build.gradle.kts
similarity index 84%
rename from VidstreamProviderTemplate/build.gradle.kts
rename to VidstreamBundle/build.gradle.kts
index e7d2158..009773d 100644
--- a/VidstreamProviderTemplate/build.gradle.kts
+++ b/VidstreamBundle/build.gradle.kts
@@ -5,7 +5,7 @@ version = 1
cloudstream {
// 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")
/**
diff --git a/DopeboxProvider/src/main/AndroidManifest.xml b/VidstreamBundle/src/main/AndroidManifest.xml
similarity index 100%
rename from DopeboxProvider/src/main/AndroidManifest.xml
rename to VidstreamBundle/src/main/AndroidManifest.xml
diff --git a/WatchAsianProvider/src/main/kotlin/com/lagradost/AsianEmbedHelper.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/AsianEmbedHelper.kt
similarity index 100%
rename from WatchAsianProvider/src/main/kotlin/com/lagradost/AsianEmbedHelper.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/AsianEmbedHelper.kt
diff --git a/AsianLoadProvider/src/main/kotlin/com/lagradost/AsianLoadProvider.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/AsianLoadProvider.kt
similarity index 100%
rename from AsianLoadProvider/src/main/kotlin/com/lagradost/AsianLoadProvider.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/AsianLoadProvider.kt
diff --git a/DramaSeeProvider/src/main/kotlin/com/lagradost/DramaSeeProvider.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/DramaSeeProvider.kt
similarity index 100%
rename from DramaSeeProvider/src/main/kotlin/com/lagradost/DramaSeeProvider.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/DramaSeeProvider.kt
diff --git a/KdramaHoodProvider/src/main/kotlin/com/lagradost/KdramaHoodProvider.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/KdramaHoodProvider.kt
similarity index 98%
rename from KdramaHoodProvider/src/main/kotlin/com/lagradost/KdramaHoodProvider.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/KdramaHoodProvider.kt
index 6c04a36..c68571c 100644
--- a/KdramaHoodProvider/src/main/kotlin/com/lagradost/KdramaHoodProvider.kt
+++ b/VidstreamBundle/src/main/kotlin/com/lagradost/KdramaHoodProvider.kt
@@ -273,10 +273,10 @@ class KdramaHoodProvider : MainAPI() {
//Log.i(this.name, "Result => (url) $url")
when {
url.startsWith("https://asianembed.io") -> {
- AsianEmbedHelper.getUrls(url, subtitleCallback, callback)
+ com.lagradost.AsianEmbedHelper.getUrls(url, subtitleCallback, callback)
}
url.startsWith("https://embedsito.com") -> {
- val extractor = XStreamCdn()
+ val extractor = com.lagradost.XStreamCdn()
extractor.domainUrl = "embedsito.com"
extractor.getUrl(url).forEach { link ->
callback.invoke(link)
diff --git a/VidstreamProviderTemplate/src/main/kotlin/com/lagradost/MultiQuality.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/MultiQuality.kt
similarity index 100%
rename from VidstreamProviderTemplate/src/main/kotlin/com/lagradost/MultiQuality.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/MultiQuality.kt
diff --git a/OpenVidsProvider/src/main/kotlin/com/lagradost/OpenVidsProvider.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/OpenVidsProvider.kt
similarity index 100%
rename from OpenVidsProvider/src/main/kotlin/com/lagradost/OpenVidsProvider.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/OpenVidsProvider.kt
diff --git a/VidEmbedProvider/src/main/kotlin/com/lagradost/VidEmbedProvider.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/VidEmbedProvider.kt
similarity index 100%
rename from VidEmbedProvider/src/main/kotlin/com/lagradost/VidEmbedProvider.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/VidEmbedProvider.kt
diff --git a/VidstreamProviderTemplate/src/main/kotlin/com/lagradost/Vidstream.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/Vidstream.kt
similarity index 100%
rename from VidstreamProviderTemplate/src/main/kotlin/com/lagradost/Vidstream.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/Vidstream.kt
diff --git a/WatchAsianProvider/src/main/kotlin/com/lagradost/WatchAsianProviderPlugin.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/VidstreamBundlePlugin.kt
similarity index 64%
rename from WatchAsianProvider/src/main/kotlin/com/lagradost/WatchAsianProviderPlugin.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/VidstreamBundlePlugin.kt
index 948a677..dfc1512 100644
--- a/WatchAsianProvider/src/main/kotlin/com/lagradost/WatchAsianProviderPlugin.kt
+++ b/VidstreamBundle/src/main/kotlin/com/lagradost/VidstreamBundlePlugin.kt
@@ -1,15 +1,15 @@
-
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 WatchAsianProviderPlugin: Plugin() {
+class VidstreamBundlePlugin : Plugin() {
override fun load(context: Context) {
// All providers should be added in this manner. Please don't edit the providers list directly.
- registerMainAPI(WatchAsianProvider())
+ registerExtractorAPI(MultiQuality())
registerExtractorAPI(XStreamCdn())
registerExtractorAPI(LayarKaca())
registerExtractorAPI(DBfilm())
@@ -17,5 +17,11 @@ class WatchAsianProviderPlugin: Plugin() {
registerExtractorAPI(FEmbed())
registerExtractorAPI(Fplayer())
registerExtractorAPI(FeHD())
+ registerMainAPI(VidEmbedProvider())
+ registerMainAPI(OpenVidsProvider())
+ registerMainAPI(KdramaHoodProvider())
+ registerMainAPI(DramaSeeProvider())
+ registerMainAPI(AsianLoadProvider())
+ registerMainAPI(WatchAsianProvider())
}
}
\ No newline at end of file
diff --git a/VidstreamProviderTemplate/src/main/kotlin/com/lagradost/VidstreamProviderTemplate.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/VidstreamProviderTemplate.kt
similarity index 100%
rename from VidstreamProviderTemplate/src/main/kotlin/com/lagradost/VidstreamProviderTemplate.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/VidstreamProviderTemplate.kt
diff --git a/WatchAsianProvider/src/main/kotlin/com/lagradost/WatchAsianProvider.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/WatchAsianProvider.kt
similarity index 100%
rename from WatchAsianProvider/src/main/kotlin/com/lagradost/WatchAsianProvider.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/WatchAsianProvider.kt
diff --git a/WatchAsianProvider/src/main/kotlin/com/lagradost/XStreamCdn.kt b/VidstreamBundle/src/main/kotlin/com/lagradost/XStreamCdn.kt
similarity index 100%
rename from WatchAsianProvider/src/main/kotlin/com/lagradost/XStreamCdn.kt
rename to VidstreamBundle/src/main/kotlin/com/lagradost/XStreamCdn.kt
diff --git a/VidstreamProviderTemplate/src/main/AndroidManifest.xml b/VidstreamProviderTemplate/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/VidstreamProviderTemplate/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/VidstreamProviderTemplate/src/main/kotlin/com/lagradost/VidstreamProviderTemplatePlugin.kt b/VidstreamProviderTemplate/src/main/kotlin/com/lagradost/VidstreamProviderTemplatePlugin.kt
deleted file mode 100644
index 2e789e4..0000000
--- a/VidstreamProviderTemplate/src/main/kotlin/com/lagradost/VidstreamProviderTemplatePlugin.kt
+++ /dev/null
@@ -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())
- }
-}
\ No newline at end of file
diff --git a/WatchAsianProvider/build.gradle.kts b/WatchAsianProvider/build.gradle.kts
deleted file mode 100644
index df3927d..0000000
--- a/WatchAsianProvider/build.gradle.kts
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/WatchAsianProvider/src/main/AndroidManifest.xml b/WatchAsianProvider/src/main/AndroidManifest.xml
deleted file mode 100644
index 29aec9d..0000000
--- a/WatchAsianProvider/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a736e6c..56bf27b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -12,13 +12,11 @@ include(
"AsiaFlixProvider",
"DoramasYTProvider",
// "SflixProProvider",
- "PinoyMoviePediaProvider",
+ "PinoyMovies",
"SeriesflixProvider",
"TrailersTwoProvider",
- "PinoyMoviesEsProvider",
"KisskhProvider",
- "DramaSeeProvider",
- "VidstreamProviderTemplate",
+ "VidstreamBundle",
"RebahinProvider",
"AllMoviesForYouProvider",
"UakinoProvider",
@@ -26,10 +24,8 @@ include(
"FaselHDProvider",
"MeloMovieProvider",
"PelisplusProvider",
- "AsianLoadProvider",
"YomoviesProvider",
"AkwamProvider",
- "VidEmbedProvider",
"IdlixProvider",
"NginxProvider",
"SoaptwoDayProvider",
@@ -40,27 +36,21 @@ include(
"ElifilmsProvider",
"VidSrcProvider",
"EgyBestProvider",
- "WatchAsianProvider",
"VfSerieProvider",
"LayarKacaProvider",
"EntrepeliculasyseriesProvider",
"TantiFilmProvider",
- "TwoEmbedProvider",
"SuperStream",
"FilmpertuttiProvider",
"FrenchStreamProvider",
- "KdramaHoodProvider",
"MyCimaProvider",
"IlGenioDelloStreamingProvider",
"EstrenosDoramasProvider",
// "HDTodayProvider",
- "DopeboxProvider",
"DubokuProvider",
"HDMProvider",
"PhimmoichillProvider",
- "PelisplusProviderTemplate",
"OlgplyProvider",
- "SolarmovieProvider",
"PeliSmartProvider",
"VfFilmProvider",
"IHaveNoTvProvider",
@@ -70,7 +60,6 @@ include(
"HDrezkaProvider",
"PelisplusHDProvider",
"MultiplexProvider",
- "OpenVidsProvider",
//"BflixProvider",
// "FmoviesToProvider",
"TheFlixToProvider",