Merge remote-tracking branch 'origin/master'

app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt

@@ -80,6 +80,7 @@ object APIHolder {
             AkwamProvider(),
             MyCimaProvider(),
             EgyBestProvider(),
+            FaselHDProvider(),
             SoaptwoDayProvider(),
             HDMProvider(),// disabled due to cloudflare
             TheFlixToProvider(),

app/src/main/java/com/lagradost/cloudstream3/movieproviders/FaselHDProvider.kt

@@ -0,0 +1,163 @@
+package com.lagradost.cloudstream3.movieproviders
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import org.jsoup.nodes.Element
+
+class FaselHDProvider : MainAPI() {
+    override val lang = "ar"
+    override var mainUrl = "https://faselhd.io"
+    override var name = "FaselHD"
+    override val usesWebView = false
+    override val hasMainPage = true
+    override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie, TvType.AsianDrama, TvType.Anime)
+
+    private fun String.getIntFromText(): Int? {
+        return Regex("""\d+""").find(this)?.groupValues?.firstOrNull()?.toIntOrNull()
+    }
+
+    private fun Element.toSearchResponse(): SearchResponse? {
+        val url = select("div.postDiv a").attr("href") ?: return null
+        val posterUrl = select("div.postDiv a div img").attr("data-src") ?:
+        select("div.postDiv a div img").attr("src")
+        val title = select("div.postDiv a div img").attr("alt")
+        val quality = select(".quality").first()?.text()?.replace("1080p |-".toRegex(), "")
+        val type = if(title.contains("فيلم")) TvType.Movie else TvType.TvSeries
+        return MovieSearchResponse(
+            title.replace("الموسم الأول|برنامج|فيلم|مترجم|اون لاين|مسلسل|مشاهدة|انمي|أنمي".toRegex(),""),
+            url,
+            this@FaselHDProvider.name,
+            type,
+            posterUrl,
+            null,
+            null,
+            quality = getQualityFromString(quality)
+        )
+    }
+
+    override suspend fun getMainPage(): HomePageResponse {
+        // Title, Url
+        val moviesUrl = listOf(
+            Pair("Movies", "$mainUrl/all-movies/page/"+(0..10).random()),
+            Pair("Series", "$mainUrl/series/page/"+(0..10).random()),
+            Pair("Top Movies IMDB", "$mainUrl/movies_top_imdb"),
+        )
+        val pages = moviesUrl.apmap { (title, url) ->
+            val doc = app.get(url).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()
+                }
+            HomePageList(title, list)
+        }
+        return HomePageResponse(pages)
+    }
+
+    override suspend fun search(query: String): List<SearchResponse> {
+        val q = query.replace(" ","+")
+        val d = app.get("$mainUrl/?s=$q").document
+        return d.select("div[id=\"postList\"] div[class=\"col-xl-2 col-lg-2 col-md-3 col-sm-3\"]")
+            .mapNotNull {
+                it.toSearchResponse()
+            }
+    }
+
+
+    override suspend fun load(url: String): LoadResponse {
+        val doc = app.get(url).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") }
+
+        val year = doc.select("div[id=\"singleList\"] div[class=\"col-xl-6 col-lg-6 col-md-6 col-sm-6\"]").firstOrNull {
+            it.text().contains("سنة|موعد".toRegex())
+        }?.text()?.getIntFromText()
+
+        val title =
+            doc.select("title").text().replace(" - فاصل إعلاني", "")
+                .replace("الموسم الأول|برنامج|فيلم|مترجم|اون لاين|مسلسل|مشاهدة|انمي|أنمي|$year".toRegex(),"")
+        // A bit iffy to parse twice like this, but it'll do.
+        val duration = doc.select("div[id=\"singleList\"] div[class=\"col-xl-6 col-lg-6 col-md-6 col-sm-6\"]").firstOrNull {
+            it.text().contains("مدة|توقيت".toRegex())
+        }?.text()?.getIntFromText()
+
+        val tags = doc.select("div[id=\"singleList\"] div[class=\"col-xl-6 col-lg-6 col-md-6 col-sm-6\"]:contains(تصنيف الفيلم) a").map {
+            it.text()
+        }
+        val recommendations = doc.select("div#postList div.postDiv").mapNotNull {
+            it.toSearchResponse()
+        }
+        val synopsis = doc.select("div.singleDesc p").text()
+        return if (isMovie) {
+            newMovieLoadResponse(
+                title,
+                url,
+                TvType.Movie,
+                url
+            ) {
+                this.posterUrl = posterUrl
+                this.year = year
+                this.plot = synopsis
+                this.duration = duration
+                this.tags = tags
+                this.recommendations = recommendations
+            }
+        } else {
+            val episodes = ArrayList<Episode>()
+            doc.select("div.epAll a").map {
+                episodes.add(
+                    Episode(
+                        it.attr("href"),
+                        it.text(),
+                        doc.select("div.seasonDiv.active div.title").text().getIntFromText() ?: 1,
+                        it.text().getIntFromText(),
+                    )
+                )
+            }
+            doc.select("div[id=\"seasonList\"] div[class=\"col-xl-2 col-lg-3 col-md-6\"] div.seasonDiv")
+                .not(".active").apmap { it ->
+                    val s = app.get("$mainUrl/?p="+it.attr("data-href")).document
+                    s.select("div.epAll a").map {
+                        episodes.add(
+                            Episode(
+                                it.attr("href"),
+                                it.text(),
+                                s.select("div.seasonDiv.active div.title").text().getIntFromText(),
+                                it.text().getIntFromText(),
+                            )
+                        )
+                    }
+                }
+            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes.distinct().sortedBy { it.episode }) {
+                this.duration = duration
+                this.posterUrl = posterUrl
+                this.year = year
+                this.plot = synopsis
+                this.tags = tags
+                this.recommendations = recommendations
+            }
+        }
+    }
+
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
+        val player = app.get(app.get(data).document.select("iframe[name=\"player_iframe\"]").attr("src")).document
+        player.select("div.quality_change button.hd_btn").map {
+                callback.invoke(
+                    ExtractorLink(
+                        this.name,
+                        this.name,
+                        it.attr("data-url"),
+                        this.mainUrl,
+                        quality = it.text().getIntFromText() ?: 0,
+                        isM3u8 = true
+                    )
+                )
+        }
+        return true
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/movieproviders/MyCimaProvider.kt

@@ -24,7 +24,7 @@ class MyCimaProvider : MainAPI() {
     }
 
     private fun Element.toSearchResponse(): SearchResponse? {
-        val url = select("div.Thumb--GridItem a")?.attr("href") ?: return null
+        val url = select("div.Thumb--GridItem a")
         val posterUrl = select("span.BG--GridItem")?.attr("data-lazy-style")
             ?.getImageURL()
         val year = select("div.GridItem span.year")?.text()
@@ -35,9 +35,9 @@ class MyCimaProvider : MainAPI() {
         // If you need to differentiate use the url.
         return MovieSearchResponse(
             title,
-            url,
+            url.attr("href"),
             this@MyCimaProvider.name,
-            TvType.TvSeries,
+            if(url.attr("title").contains("فيلم")) TvType.Movie else TvType.TvSeries,
             posterUrl,
             year?.getIntFromText(),
             null,
@@ -314,12 +314,10 @@ class MyCimaProvider : MainAPI() {
                     callback.invoke(
                         ExtractorLink(
                             this.name,
-                            this.name + " - ${
+                            this.name,
-                                linkElement.select("resolution").text().getIntFromText()
-                            }p",
                             linkElement.attr("href"),
                             this.mainUrl,
-                            2
+                            quality = linkElement.select("resolution").text().getIntFromText() ?: 0
                         )
                     )
                 }

docs/providers.json

@@ -119,6 +119,11 @@
         "status": 1,
         "url": "https://entrepeliculasyseries.nu"
     },
+    "FaselHDProvider": {
+        "name": "FaselHD",
+        "status": 1,
+        "url": "https://faselhd.io"
+    },
     "FilmanProvider": {
         "name": "filman.cc",
         "status": 1,