fix(ar/animeblkom): Fix thumbnails & video extractor (#1571)

* fix: Fix thumbnails

* fix: Fix video extractor and add more

* refactor: Minor refactor

* chore: Bump version

src/ar/animeblkom/build.gradle

@@ -5,8 +5,13 @@ ext {
     extName = 'أنمي بالكوم'
     pkgNameSuffix = 'ar.animeblkom'
     extClass = '.AnimeBlkom'
-    extVersionCode = 8
+    extVersionCode = 9
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(":lib-okru-extractor"))
+    implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1")
+}
+
 apply from: "$rootDir/common.gradle"

src/ar/animeblkom/src/eu/kanade/tachiyomi/animeextension/ar/animeblkom/AnimeBlkom.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.ar.animeblkom.extractors.Mp4uploadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -11,11 +12,10 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -34,126 +34,96 @@ class AnimeBlkom : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = false
 
-    override val client: OkHttpClient = network.cloudflareClient
+    override val client = network.cloudflareClient
+
+    override fun headersBuilder() = super.headersBuilder().add("Referer", baseUrl)
 
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override fun headersBuilder(): Headers.Builder {
+    // ============================== Popular ===============================
-        return super.headersBuilder()
+    override fun popularAnimeSelector() = "div.contents div.poster > a"
-            .add("Referer", "https://animeblkom.net")
-    }
 
-    // Popular
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/animes-list/?sort_by=rate&page=$page")
-
-    override fun popularAnimeSelector(): String = "div.contents div.content div.content-inner div.poster a"
-
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/anime-list?page=$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
+        return SAnime.create().apply {
-        anime.thumbnail_url = baseUrl + element.select("img").attr("data-original")
+            val img = element.selectFirst("img")!!
-        anime.setUrlWithoutDomain(element.attr("href"))
+            thumbnail_url = img.attr("data-original")
-        anime.title = element.select("img").attr("alt").removePrefix(" poster")
+            title = img.attr("alt").removeSuffix(" poster")
-        return anime
+            setUrlWithoutDomain(element.attr("href"))
+        }
     }
 
-    override fun popularAnimeNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]"
+    override fun popularAnimeNextPageSelector() = "ul.pagination li.page-item a[rel=next]"
-
-    // episodes
 
+    // ============================== Episodes ==============================
     override fun episodeListParse(response: Response): List<SEpisode> {
         val document = response.asJsoup()
         if (document.selectFirst(episodeListSelector()) == null) {
             return oneEpisodeParse(document)
         }
-        return document.select(episodeListSelector()).map { episodeFromElement(it) }.reversed()
+        return document.select(episodeListSelector()).map(::episodeFromElement).reversed()
     }
 
     private fun oneEpisodeParse(document: Document): List<SEpisode> {
-        val episode = SEpisode.create()
+        return SEpisode.create().apply {
-        episode.setUrlWithoutDomain(document.location())
+            setUrlWithoutDomain(document.location())
-        episode.episode_number = 1F
+            episode_number = 1F
-        episode.name = document.selectFirst("div.name.col-xs-12 span h1")!!.text()
+            name = document.selectFirst("div.name.col-xs-12 span h1")!!.text()
-        return listOf(episode)
+        }.let(::listOf)
     }
 
     override fun episodeListSelector() = "ul.episodes-links li a"
 
     override fun episodeFromElement(element: Element): SEpisode {
-        val episode = SEpisode.create()
+        return SEpisode.create().apply {
-        val epNum = getNumberFromEpsString(element.select("span:nth-child(3)").text())
+            setUrlWithoutDomain(element.attr("href"))
-        episode.setUrlWithoutDomain(element.attr("href"))
+
-        episode.episode_number = when {
+            val eptitle = element.selectFirst("span:nth-child(3)")!!.text()
-            (epNum.isNotEmpty()) -> epNum.toFloat()
+            val epNum = eptitle.filter { it.isDigit() }
+            episode_number = when {
+                (epNum.isNotEmpty()) -> epNum.toFloatOrNull() ?: 1F
                 else -> 1F
             }
-        // episode.episode_number = element.select("span:nth-child(3)").text().replace(" - ", "").toFloat()
+            name = eptitle + " :" + element.selectFirst("span:nth-child(1)")!!.text()
-        episode.name = element.select("span:nth-child(3)").text() + " :" + element.select("span:nth-child(1)").text()
+        }
-
-        return episode
     }
 
-    private fun getNumberFromEpsString(epsStr: String): String {
+    // ============================ Video Links =============================
-        return epsStr.filter { it.isDigit() }
-    }
-
-    // Video links
-
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
-        val iframe = document.selectFirst("iframe")!!.attr("src")
+        return document.select("span.server a").mapNotNull {
-        val referer = response.request.url.encodedPath
+            val url = it.attr("data-src").replace("http://", "https://")
-        val newHeaders = Headers.headersOf("referer", baseUrl + referer)
+            when {
-        val iframeResponse = client.newCall(GET(iframe, newHeaders))
+                "new.vid4up" in url -> {
+                    val urlResponse = client.newCall(GET(url, headers))
                         .execute().asJsoup()
-        return iframeResponse.select(videoListSelector()).map { videoFromElement(it, iframe) }
+                    urlResponse.select(videoListSelector()).map(::videoFromElement)
+                }
+                "ok.ru" in url -> OkruExtractor(client).videosFromUrl(url)
+                "mp4upload" in url -> Mp4uploadExtractor(client).videosFromUrl(url, headers)
+                else -> null
+            }
+        }.flatten()
     }
 
     override fun videoListSelector() = "source"
 
-    override fun videoFromElement(element: Element) = throw Exception("Not used")
+    override fun videoFromElement(element: Element): Video {
-
-    private fun videoFromElement(element: Element, referrer: String): Video {
         val videoUrl = element.attr("src")
-        val headers = Headers.headersOf("Referer", referrer)
+        return Video(videoUrl, "Blkbom - " + element.attr("label"), videoUrl, headers = headers)
-        return Video(videoUrl, element.attr("res") + "p", videoUrl, headers = headers)
-    }
-
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", null)
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality.contains(quality)) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
     }
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
 
-    // Search
+    // =============================== Search ===============================
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
 
-    override fun searchAnimeFromElement(element: Element): SAnime {
+    override fun searchAnimeNextPageSelector() = popularAnimeNextPageSelector()
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.attr("href"))
-        anime.thumbnail_url = baseUrl + element.selectFirst("img")!!.attr("data-original")
-        anime.title = element.select("img").attr("alt").replace(" poster", "")
-        return anime
-    }
 
-    override fun searchAnimeNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]"
+    override fun searchAnimeSelector() = popularAnimeSelector()
-
-    override fun searchAnimeSelector(): String = "div.contents div.content div.content-inner div.poster a"
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val url = if (query.isNotBlank()) {
@@ -176,28 +146,26 @@ class AnimeBlkom : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return GET(url, headers)
     }
 
-    // Anime Details
+    // =========================== Anime Details ============================
-
     override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create()
+        return SAnime.create().apply {
-        anime.thumbnail_url = baseUrl + document.select("div.poster img").attr("data-original")
+            thumbnail_url = document.selectFirst("div.poster img")!!.attr("data-original")
-        anime.title = document.select("div.name span h1").text()
+            title = document.selectFirst("div.name span h1")!!.text()
-        anime.genre = document.select("p.genres a").joinToString(", ") { it.text() }
+            genre = document.select("p.genres a").joinToString { it.text() }
-        anime.description = document.select("div.story p, div.story").text()
+            description = document.selectFirst("div.story p, div.story")?.text()
-        anime.author = document.select("div:contains(الاستديو) span > a").text()
+            author = document.selectFirst("div:contains(الاستديو) span > a")?.text()
-        document.select("span.info")?.text()?.also { statusText ->
+            status = document.selectFirst("div.info-table div:contains(حالة الأنمي) span.info")?.text()?.let {
                 when {
-                statusText.contains("مستمر", true) -> anime.status = SAnime.ONGOING
+                    it.contains("مستمر") -> SAnime.ONGOING
-                statusText.contains("مكتمل", true) -> anime.status = SAnime.COMPLETED
+                    it.contains("مكتمل") -> SAnime.COMPLETED
-                else -> anime.status = SAnime.UNKNOWN
+                    else -> null
                 }
+            } ?: SAnime.UNKNOWN
+            artist = document.selectFirst("div:contains(المخرج) > span.info")?.text()
         }
-        anime.artist = document.select("div:contains(المخرج) > span.info").text()
-        return anime
     }
 
-    // Latest
+    // =============================== Latest ===============================
-
     override fun latestUpdatesNextPageSelector(): String? = throw Exception("Not used")
 
     override fun latestUpdatesFromElement(element: Element): SAnime = throw Exception("Not used")
@@ -206,8 +174,7 @@ class AnimeBlkom : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesSelector(): String = throw Exception("Not used")
 
-    // Filter
+    // ============================== Filters ===============================
-
     override fun getFilterList() = AnimeFilterList(
         AnimeFilter.Header("الفلترات مش هتشتغل لو بتبحث او وهي فاضيه"),
         TypeList(typesName),
@@ -228,15 +195,14 @@ class AnimeBlkom : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Type(" قائمة الحلقات خاصة ", "special-list"),
     )
 
-    // preferred quality settings
+    // ============================== Settings ==============================
-
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+            key = PREF_QUALITY_KEY
-            title = "Preferred quality"
+            title = PREF_QUALITY_TITLE
-            entries = arrayOf("1080p", "720p", "480p", "360p", "240p")
+            entries = PREF_QUALITY_ENTRIES
-            entryValues = arrayOf("1080", "720", "480", "360", "240")
+            entryValues = PREF_QUALITY_ENTRIES
-            setDefaultValue("1080")
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -248,4 +214,19 @@ class AnimeBlkom : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
         screen.addPreference(videoQualityPref)
     }
+
+    // ============================= Utilities ==============================
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        return sortedWith(
+            compareBy { it.quality.contains(quality) },
+        ).reversed()
+    }
+
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_TITLE = "Preferred quality"
+        private const val PREF_QUALITY_DEFAULT = "720p"
+        private val PREF_QUALITY_ENTRIES = arrayOf("1080p", "720p", "480p", "360p", "240p")
+    }
 }

src/ar/animeblkom/src/eu/kanade/tachiyomi/animeextension/ar/animeblkom/extractors/Mp4uploadExtractor.kt

@@ -0,0 +1,25 @@
+package eu.kanade.tachiyomi.animeextension.ar.animeblkom.extractors
+
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class Mp4uploadExtractor(private val client: OkHttpClient) {
+    fun videosFromUrl(url: String, headers: Headers): List<Video> {
+        val body = client.newCall(GET(url, headers = headers)).execute().body.string()
+
+        val packed = "eval(function(p,a,c,k,e,d)" + body.substringAfter("<script type='text/javascript'>eval(function(p,a,c,k,e,d)")
+            .substringBefore("</script>")
+
+        val unpacked = JsUnpacker.unpackAndCombine(packed) ?: return emptyList()
+        val qualityRegex = """\WHEIGHT=(\d+)""".toRegex()
+        val videoQuality = qualityRegex.find(unpacked)?.groupValues?.let { "${it[1]}p" } ?: ""
+
+        val videoUrl = unpacked.substringAfter("player.src(\"").substringBefore("\");")
+        return listOf(
+            Video(videoUrl, "Mp4upload - $videoQuality", videoUrl, headers = Headers.headersOf("Referer", "https://www.mp4upload.com/")),
+        )
+    }
+}