fix #580, fix #575, solved #566

DubokuProvider/build.gradle.kts

@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {

DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt

@@ -3,10 +3,10 @@ package com.hexated
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
+import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
 import org.jsoup.nodes.Element
+import java.net.URLDecoder
 
 class DubokuProvider : MainAPI() {
     override var mainUrl = "https://www.duboku.tv"
@@ -110,21 +110,29 @@ class DubokuProvider : MainAPI() {
             if (script.data().contains("var player_data={")) {
                 val dataJson =
                     script.data().substringAfter("var player_data={").substringBefore("}")
-                tryParseJson<Sources>("{$dataJson}")?.let { source ->
+                val source = tryParseJson<Sources>("{$dataJson}")
-                    M3u8Helper.generateM3u8(
+                callback.invoke(
+                    ExtractorLink(
                         this.name,
-                        source.url ?: return@map,
+                        this.name,
-                        referer = "https://w.duboku.io/",
+                        decode(base64Decode(source?.url ?: return@map)),
-                        headers = mapOf("Origin" to "https://w.duboku.io")
+                        "https://w.duboku.io/",
-                    ).forEach(callback)
+                        Qualities.Unknown.value,
-                }
+                        INFER_TYPE,
+                        headers = mapOf(
+                            "Accept-Language" to "en-US,en;q=0.5",
+                            "Origin" to "https://w.duboku.io"
+                        ),
+                    )
+                )
             }
         }
 
-
         return true
     }
 
+    private fun decode(input: String): String = URLDecoder.decode(input, "utf-8")
+
     data class Sources(
         @JsonProperty("url") val url: String?,
     )

Kinoger/build.gradle.kts

@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {

Kinoger/src/main/kotlin/com/hexated/Kinoger.kt

@@ -2,6 +2,7 @@ package com.hexated
 
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.extractors.Chillx
+import com.lagradost.cloudstream3.network.CloudflareKiller
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
@@ -11,7 +12,7 @@ import org.jsoup.nodes.Element
 
 class Kinoger : MainAPI() {
     override var name = "Kinoger"
-    override var mainUrl = "https://kinoger.com"
+    override var mainUrl = "https://kinoger.to"
     override var lang = "de"
     override val hasMainPage = true
     override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie)

Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt

@@ -4,7 +4,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
 import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import org.jsoup.nodes.Element
+import org.jsoup.select.Elements
 
 class Raveeflix : MainAPI() {
     override var mainUrl = "https://raveeflix.my.id"
@@ -21,6 +24,7 @@ class Raveeflix : MainAPI() {
     override val mainPage =
         mainPageOf(
             "categories/trending" to "Trending",
+            "movies" to "Movies",
             "tv" to "Tv-Shows",
             "drakor" to "Drakor",
             "categories/anime" to "Anime",
@@ -45,34 +49,41 @@ class Raveeflix : MainAPI() {
         val href = fixUrl(this.attr("href"))
         val posterUrl = this.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
 
-        return newMovieSearchResponse(title, href, TvType.Movie) {
+        return newMovieSearchResponse(title, Media(href, posterUrl).toJson(), TvType.Movie) {
             this.posterUrl = posterUrl
         }
     }
 
     override suspend fun search(query: String): List<SearchResponse>? {
-        val res = app.get("$mainUrl/index.json").text.let { AppUtils.tryParseJson<ArrayList<Index>>(it) }
+        val res =
+            app.get("$mainUrl/index.json").text.let { AppUtils.tryParseJson<ArrayList<Index>>(it) }
         return res?.filter {
             it.title?.contains(
                 query,
                 true
-            ) == true && !it.section.equals("Categories", true) && !it.section.equals("Tags", true) && it.permalink?.contains("/episode") == false
+            ) == true && !it.section.equals("Categories", true) && !it.section.equals(
+                "Tags",
+                true
+            ) && it.permalink?.contains("/episode") == false
         }?.mapNotNull {
             newMovieSearchResponse(
                 it.title ?: return@mapNotNull null,
-                fixUrl(
+                Media(
-                    it.permalink?.substringBefore("episode")?.substringBefore("season")
+                    fixUrl(
-                        ?: return@mapNotNull null,
+                        it.permalink?.substringBefore("episode")?.substringBefore("season")
-                ),
+                            ?: return@mapNotNull null
+                    )
+                ).toJson(),
                 TvType.Movie,
             )
         }
     }
 
     override suspend fun load(url: String): LoadResponse {
-        val document = app.get(url).document
+        val media = parseJson<Media>(url)
+        val document = app.get(media.url).document
         val title = document.selectFirst("h1.text-4xl")?.text() ?: "No Title"
-        val poster = document.selectFirst("div.thumbnail_card, div.w-full.thumbnail_card_related")
+        val poster = media.poster ?: document.selectFirst("div.thumbnail_card, div.w-full.thumbnail_card_related")
             ?.attr("style")?.getPoster()
         val type =
             if (document.select("mux-player").isNullOrEmpty()) TvType.TvSeries else TvType.Movie
@@ -103,42 +114,24 @@ class Raveeflix : MainAPI() {
             document.select("section.w-full a.min-w-full").mapNotNull { it.toSearchResult() }
 
         return if (type == TvType.TvSeries) {
-            val section = document.select("div.relative > section.w-full a.min-w-full")
+            val sectionSelector = "div.relative > section.w-full a.min-w-full"
+            val section = document.select(sectionSelector)
             val hasMultipleSeason = section.any { it.attr("href").contains("/season-") }
-            val episodes =
+            val episodes = if (hasMultipleSeason) {
-                if (hasMultipleSeason) {
+                section.apmap { ss ->
-                    section.apmap { ss ->
+                    fetchEpisodesFromPages(
-                        val season = ss.selectFirst("div.text-xl")?.text()?.filter { it.isDigit() }
+                        ss.attr("href"),
+                        5,
+                        sectionSelector,
+                        true,
+                        ss.selectFirst("div.text-xl")?.text()?.filter { it.isDigit() }
                             ?.toIntOrNull()
-                        app.get(fixUrl(ss.attr("href"))).document.select("div.relative > section.w-full a.min-w-full")
+                    )
-                            .mapNotNull { eps ->
+                }.toMutableList().flatten()
-                                val name = eps.selectFirst("div.text-xl")?.text()
+            } else {
-                                    ?: return@mapNotNull null
+                fetchEpisodesFromPages(media.url, 5, sectionSelector, false)
-                                val href = fixUrl(eps.attr("href"))
+            }
-                                val posterUrl = eps.selectFirst("div.thumbnail_card")?.attr("style")
+            newTvSeriesLoadResponse(title, media.url, TvType.TvSeries, episodes.reversed()) {
-                                    ?.getPoster()
-                                Episode(
-                                    href,
-                                    name,
-                                    posterUrl = posterUrl,
-                                    season = season
-                                )
-                            }
-                    }.flatten()
-                } else {
-                    section.mapNotNull { eps ->
-                        val name = eps.selectFirst("div.text-xl")?.text() ?: return@mapNotNull null
-                        val href = fixUrl(eps.attr("href"))
-                        val posterUrl =
-                            eps.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
-                        Episode(
-                            href,
-                            name,
-                            posterUrl = posterUrl,
-                        )
-                    }
-                }
-            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes.reversed()) {
                 this.posterUrl = poster
                 this.year = year
                 this.seasonNames
@@ -149,7 +142,7 @@ class Raveeflix : MainAPI() {
                 this.recommendations = recommendations
             }
         } else {
-            newMovieLoadResponse(title, url, TvType.Movie, url) {
+            newMovieLoadResponse(title, media.url, TvType.Movie, media.url) {
                 this.posterUrl = poster
                 this.year = year
                 this.plot = description
@@ -183,6 +176,39 @@ class Raveeflix : MainAPI() {
         return true
     }
 
+    private suspend fun fetchEpisodesFromPages(
+        baseUrl: String,
+        maxPages: Int,
+        sectionSelector: String,
+        hasMultipleSeasons: Boolean,
+        season: Int? = null
+    ): MutableList<Episode> {
+        val epsData = mutableListOf<Episode>()
+        for (index in 1..maxPages) {
+            val pageUrl = if (index == 1) baseUrl else "${baseUrl.removeSuffix("/")}/page/$index/"
+            val episodeVo = app.get(fixUrl(pageUrl)).document.select(sectionSelector)
+                .getEpisodes(if (hasMultipleSeasons) season else null)
+            if (episodeVo.isEmpty()) break
+            epsData.addAll(episodeVo)
+        }
+        return epsData
+    }
+
+    private fun Elements.getEpisodes(season: Int? = 1): List<Episode> {
+        return this.mapNotNull { eps ->
+            val name = eps.selectFirst("div.text-xl")?.text() ?: return@mapNotNull null
+            val href = fixUrl(eps.attr("href"))
+            val posterUrl =
+                eps.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
+            Episode(
+                href,
+                name,
+                posterUrl = posterUrl,
+                season = season
+            )
+        }
+    }
+
     private fun String.getPoster(): String? {
         return fixUrlNull(
             this.substringAfter("(")
@@ -190,6 +216,8 @@ class Raveeflix : MainAPI() {
         )
     }
 
+    data class Media(val url: String, val poster: String? = null)
+
     data class Index(
         @JsonProperty("title") val title: String? = null,
         @JsonProperty("permalink") val permalink: String? = null,