From 3ec8dc1903e91234829972c9ca5bc210eefbc6ab Mon Sep 17 00:00:00 2001 From: Zaw <42999156+ImZaw@users.noreply.github.com> Date: Fri, 28 Oct 2022 00:21:41 +0300 Subject: [PATCH] shahid4u fix, and maybe faselhd cf fix --- FaselHDProvider/build.gradle.kts | 2 +- .../src/main/kotlin/com/faselhd/FaselHDProvider.kt | 13 ++++++++----- Shahid4uProvider/build.gradle.kts | 2 +- .../main/kotlin/com/shahid4u/Shahid4uProvider.kt | 5 +++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/FaselHDProvider/build.gradle.kts b/FaselHDProvider/build.gradle.kts index 10167b8..38d96be 100644 --- a/FaselHDProvider/build.gradle.kts +++ b/FaselHDProvider/build.gradle.kts @@ -1,4 +1,4 @@ -version = 4 +version = 5 cloudstream { description = "" diff --git a/FaselHDProvider/src/main/kotlin/com/faselhd/FaselHDProvider.kt b/FaselHDProvider/src/main/kotlin/com/faselhd/FaselHDProvider.kt index 42e5216..01b51a7 100644 --- a/FaselHDProvider/src/main/kotlin/com/faselhd/FaselHDProvider.kt +++ b/FaselHDProvider/src/main/kotlin/com/faselhd/FaselHDProvider.kt @@ -47,7 +47,8 @@ class FaselHD : MainAPI() { ) override suspend fun getMainPage(page: Int, request : MainPageRequest): HomePageResponse { - val doc = app.get(request.data + page).document + var doc = app.get(request.data + page).document + if(doc.select("title").text() === "Just a moment...") doc = app.get(request.data + page, interceptor = CloudflareKiller()).document val list = doc.select("div[id=\"postList\"] div[class=\"col-xl-2 col-lg-2 col-md-3 col-sm-3\"]") .mapNotNull { element -> element.toSearchResponse() @@ -57,7 +58,8 @@ class FaselHD : MainAPI() { override suspend fun search(query: String): List { val q = query.replace(" ","+") - val d = app.get("$mainUrl/?s=$q").document + var d = app.get("$mainUrl/?s=$q").document + if(d.select("title").text() === "Just a moment...") d = app.get("$mainUrl/?s=$q", interceptor = CloudflareKiller()).document return d.select("div[id=\"postList\"] div[class=\"col-xl-2 col-lg-2 col-md-3 col-sm-3\"]") .mapNotNull { it.toSearchResponse() @@ -66,7 +68,8 @@ class FaselHD : MainAPI() { override suspend fun load(url: String): LoadResponse { - val doc = app.get(url).document + var doc = app.get(url).document + if(doc.select("title").text() === "Just a moment...") doc = app.get(url, interceptor = CloudflareKiller()).document val isMovie = doc.select("div.epAll").isEmpty() val posterUrl = doc.select("div.posterImg img").attr("src") .ifEmpty { doc.select("div.seasonDiv.active img").attr("data-src") } @@ -147,14 +150,14 @@ class FaselHD : MainAPI() { subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit ): Boolean { - val doc = app.get(data).document + var doc = app.get(data).document + if(doc.select("title").text() === "Just a moment...") doc = app.get(data, interceptor = CloudflareKiller()).document listOf( doc.select(".downloadLinks a").attr("href") to "download", doc.select("iframe[name=\"player_iframe\"]").attr("src") to "iframe" ).apmap { (url, method) -> if(method == "download") { val player = app.post(url, interceptor = CloudflareKiller(), referer = mainUrl).document - callback.invoke( ExtractorLink( this.name, diff --git a/Shahid4uProvider/build.gradle.kts b/Shahid4uProvider/build.gradle.kts index 3986cae..5b2a022 100644 --- a/Shahid4uProvider/build.gradle.kts +++ b/Shahid4uProvider/build.gradle.kts @@ -1,4 +1,4 @@ -version = 4 +version = 5 cloudstream { description = "" diff --git a/Shahid4uProvider/src/main/kotlin/com/shahid4u/Shahid4uProvider.kt b/Shahid4uProvider/src/main/kotlin/com/shahid4u/Shahid4uProvider.kt index 530fb61..ed48620 100644 --- a/Shahid4uProvider/src/main/kotlin/com/shahid4u/Shahid4uProvider.kt +++ b/Shahid4uProvider/src/main/kotlin/com/shahid4u/Shahid4uProvider.kt @@ -8,7 +8,7 @@ import org.jsoup.nodes.Element class Shahid4u : MainAPI() { override var lang = "ar" - override var mainUrl = "https://shahid4u.cc" + override var mainUrl = "https://shahed4u.network" override var name = "Shahid4u" override val usesWebView = false override val hasMainPage = true @@ -38,7 +38,7 @@ class Shahid4u : MainAPI() { ) } override val mainPage = mainPageOf( - "$mainUrl/movies-2/page/" to "Movies", + "$mainUrl/movies-3/page/" to "Movies", "$mainUrl/netflix/page/" to "Series & Anime", ) @@ -46,6 +46,7 @@ class Shahid4u : MainAPI() { val doc = app.get(request.data + page).document val list = doc.select("div.content-box") .mapNotNull { element -> + println(element.select("a.fullClick").attr("title")) element.toSearchResponse() } return newHomePageResponse(request.name, list)