diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt index f39510ee..b086d3ce 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt @@ -34,20 +34,11 @@ object APIHolder { val allProviders by lazy { arrayListOf( + // Movie providers PelisplusProvider(), PelisplusHDProvider(), PeliSmartProvider(), - GogoanimeProvider(), - AllAnimeProvider(), - AnimekisaProvider(), - //ShiroProvider(), // v2 fucked me - AnimeFlickProvider(), - AnimeflvnetProvider(), - - TenshiProvider(), - WcoProvider(), - // MeloMovieProvider(), // Captcha for links - DubbedAnimeProvider(), + MeloMovieProvider(), // Captcha for links DoramasYTProvider(), CinecalidadProvider(), CuevanaProvider(), @@ -55,34 +46,22 @@ object APIHolder { PelisflixProvider(), SeriesflixProvider(), IHaveNoTvProvider(), // Documentaries provider - //LookMovieProvider(), // RECAPTCHA (Please allow up to 5 seconds...) + LookMovieProvider(), // RECAPTCHA (Please allow up to 5 seconds...) VMoveeProvider(), - WatchCartoonOnlineProvider(), AllMoviesForYouProvider(), - ApiMDBProvider(), - - MonoschinosProvider(), - VidEmbedProvider(), VfFilmProvider(), VfSerieProvider(), FrenchStreamProvider(), - AsianLoadProvider(), - - RealBflixProvider(), - FmoviesProvider(), + AsiaFlixProvider(), // restricted + BflixProvider(), + FmoviesToProvider(), SflixProProvider(), - - RealSflixProvider(), + FilmanProvider(), + SflixProvider(), DopeboxProvider(), SolarmovieProvider(), - - //TmdbProvider(), - - FilmanProvider(), - - ZoroProvider(), PinoyMoviePediaProvider(), PinoyHDXyzProvider(), PinoyMoviesEsProvider(), @@ -94,18 +73,31 @@ object APIHolder { AkwamProvider(), MyCimaProvider(), EgyBestProvider(), + SoaptwoDayProvider(), + HDMProvider(),// disabled due to cloudflare + + // Metadata providers + //TmdbProvider(), + CrossTmdbProvider(), + ApiMDBProvider(), + + // Anime providers + WatchCartoonOnlineProvider(), + GogoanimeProvider(), + AllAnimeProvider(), + AnimekisaProvider(), + //ShiroProvider(), // v2 fucked me + AnimeFlickProvider(), + AnimeflvnetProvider(), + TenshiProvider(), + WcoProvider(), AnimePaheProvider(), NineAnimeProvider(), AnimeWorldProvider(), - SoaptwoDayProvider(), - - CrossTmdbProvider(), - - //restricted - AsiaFlixProvider(), - //backwards - KawaiifuProvider(), // removed due to cloudflare - HDMProvider(),// removed due to cloudflare + ZoroProvider(), + DubbedAnimeProvider(), + MonoschinosProvider(), + KawaiifuProvider(), // disabled due to cloudflare ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/BflixProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/BflixProvider.kt index 64955067..332fe94c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/BflixProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/BflixProvider.kt @@ -7,13 +7,18 @@ import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.Jsoup -class RealBflixProvider : BflixProvider("https://bflix.ru","Bflix") -class FmoviesProvider : BflixProvider("https://fmovies.to","Fmovies.to") -class SflixProProvider : BflixProvider("https://sflix.pro","Sflix.pro") +class FmoviesToProvider : BflixProvider() { + override var mainUrl = "https://fmovies.to" + override var name = "Fmovies.to" +} +class SflixProProvider : BflixProvider() { + override var mainUrl = "https://sflix.pro" + override var name = "Sflix.pro" +} -open class BflixProvider(providerUrl: String, providerName: String) : MainAPI() { - override var mainUrl = providerUrl - override var name = providerName +open class BflixProvider() : MainAPI() { + override var mainUrl = "https://bflix.ru" + override var name = "Bflix" override val hasMainPage = true override val hasChromecastSupport = true override val hasDownloadSupport = true diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SflixProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SflixProvider.kt index 19741d79..0c93cfbb 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SflixProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SflixProvider.kt @@ -21,13 +21,18 @@ import org.jsoup.nodes.Element import java.net.URI import kotlin.system.measureTimeMillis -class RealSflixProvider : SflixProvider("https://sflix.to", "Sflix.to") -class DopeboxProvider : SflixProvider("https://dopebox.to", "Dopebox") -class SolarmovieProvider : SflixProvider("https://solarmovie.pe", "Solarmovie") +class DopeboxProvider : SflixProvider() { + override var mainUrl = "https://dopebox.to" + override var name = "Dopebox" +} +class SolarmovieProvider : SflixProvider() { + override var mainUrl = "https://solarmovie.pe" + override var name = "Solarmovie" +} -open class SflixProvider(providerUrl: String, providerName: String) : MainAPI() { - override var mainUrl = providerUrl - override var name = providerName +open class SflixProvider() : MainAPI() { + override var mainUrl = "https://sflix.to" + override var name = "Sflix.to" override val hasQuickSearch = false override val hasMainPage = true diff --git a/providers.json b/providers.json index bafde348..5a30acba 100644 --- a/providers.json +++ b/providers.json @@ -1,7 +1,7 @@ { "AkwamProvider": { "name": "Akwam", - "url": "https://akwam.io", + "url": "https://akwam.to", "status": 1 }, "AllAnimeProvider": { @@ -44,12 +44,17 @@ "url": "https://asianembed.io", "status": 1 }, - "RealBflixProvider": { + "AsiaFlixProvider": { + "name": "AsiaFlix", + "url": "https://asiaflix.app", + "status": 3 + }, + "BflixProvider": { "name": "Bflix", "url": "https://bflix.ru", "status": 1 }, - "FmoviesProvider": { + "FmoviesToProvider": { "name": "Fmovies.to", "url": "https://fmovies.to", "status": 1 @@ -71,7 +76,7 @@ }, "CuevanaProvider": { "name": "Cuevana", - "url": "https://cuevana3.io", + "url": "https://cuevana3.me", "status": 1 }, "DoramasYTProvider": { @@ -194,6 +199,21 @@ "url": "https://pinoymovies.es", "status": 1 }, + "SflixProvider": { + "name": "Sflix.to", + "url": "https://sflix.to", + "status": 1 + }, + "DopeboxProvider": { + "name": "Dopebox", + "url": "https://dopebox.to", + "status": 1 + }, + "SolarmovieProvider": { + "name": "Solarmovie", + "url": "https://solarmovie.pe", + "status": 1 + }, "SeriesflixProvider": { "name": "Seriesflix", "url": "https://seriesflix.video", @@ -258,20 +278,5 @@ "name": "Zoro", "url": "https://zoro.to", "status": 1 - }, - "RealSflixProvider": { - "name": "Sflix.to", - "url": "https://sflix.to", - "status": 1 - }, - "DopeboxProvider": { - "name": "Dopebox", - "url": "https://dopebox.to", - "status": 1 - }, - "SolarmovieProvider": { - "name": "Solarmovie", - "url": "https://solarmovie.pe", - "status": 1 } -} \ No newline at end of file +}