merge my cima extensions (#946)

* fix shahid4u

* movizland minor fix

* movizland minor fix

* asia2tv fix cloudflare issue

* merge my cima extensions

src/ar/mycima/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'MY CIMA'
     pkgNameSuffix = 'ar.mycima'
     extClass = '.MyCima'
-    extVersionCode = 15
+    extVersionCode = 16
     libVersion = '13'
 }
 

src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt

@@ -27,7 +27,7 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val name = "MY Cima"
 
-    override val baseUrl = "https://mycima.pw"
+    override val baseUrl = "https://mycimaa.makeup"
 
     override val lang = "ar"
 
@@ -39,10 +39,12 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    // Popular Anime
+    // ============================== popular ==============================
 
     override fun popularAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
 
+    override fun popularAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
+
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/seriestv/top/?page_number=$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
@@ -57,9 +59,9 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return anime
     }
 
-    override fun popularAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
+    // ============================== episodes ==============================
 
-    // Episodes
+    override fun episodeListSelector() = "div.Episodes--Seasons--Episodes a"
 
     private fun seasonsNextPageSelector(seasonNumber: Int) = "div.List--Seasons--Episodes > a:nth-child($seasonNumber)"
 
@@ -68,36 +70,49 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         var seasonNumber = 1
         fun addEpisodes(document: Document) {
-            document.select(episodeListSelector()).map { episodes.add(episodeFromElement(it)) }
-            document.select(seasonsNextPageSelector(seasonNumber)).firstOrNull()?.let {
-                seasonNumber++
-                addEpisodes(client.newCall(GET(it.attr("abs:href"), headers)).execute().asJsoup())
+            if (document.select(episodeListSelector()).isNullOrEmpty()) {
+                if (!document.select("mycima singlerelated.hasdivider ${popularAnimeSelector()}").isNullOrEmpty()) {
+                    document.select("mycima singlerelated.hasdivider ${popularAnimeSelector()}").map { episodes.add(newEpisodeFromElement(it, "mSeries")) }
+                } else
+                    episodes.add(newEpisodeFromElement(document.select("div.Poster--Single-begin > a").first(), "movie"))
+            } else {
+                document.select(episodeListSelector()).map { episodes.add(newEpisodeFromElement(it)) }
+                document.select(seasonsNextPageSelector(seasonNumber)).firstOrNull()?.let {
+                    seasonNumber++
+                    addEpisodes(
+                        client.newCall(GET(it.attr("abs:href"), headers)).execute().asJsoup()
+                    )
+                }
             }
         }
-
         addEpisodes(response.asJsoup())
         return episodes
     }
 
-    override fun episodeListSelector() = "div.Episodes--Seasons--Episodes a"
-
-    override fun episodeFromElement(element: Element): SEpisode {
+    private fun newEpisodeFromElement(element: Element, type: String = "series"): SEpisode {
         val episode = SEpisode.create()
         val epNum = getNumberFromEpsString(element.text())
-        episode.setUrlWithoutDomain(element.attr("abs:href"))
-        episode.episode_number = when {
-            (epNum.isNotEmpty()) -> epNum.toFloat()
-            else -> 1F
+        episode.setUrlWithoutDomain(if (type == "mSeries") element.select("a").attr("href") else element.attr("abs:href"))
+        if (type == "series")
+            episode.episode_number = when {
+                (epNum.isNotEmpty()) -> epNum.toFloat()
+                else -> 1F
+            }
+        episode.name = when (type) {
+            "movie" -> "مشاهدة"
+            "mSeries" -> element.select("a").attr("title")
+            else -> element.ownerDocument().select("div.List--Seasons--Episodes a.selected").text() + element.text()
         }
-        episode.name = element.ownerDocument().select("div.List--Seasons--Episodes a.selected").text() + " : " + element.text()
         return episode
     }
 
+    override fun episodeFromElement(element: Element): SEpisode = throw Exception("not used")
+
     private fun getNumberFromEpsString(epsStr: String): String {
         return epsStr.filter { it.isDigit() }
     }
 
-    // Video urls
+    // ============================== video urls ==============================
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -120,7 +135,6 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             val scriptV = element.select("script:containsData(source)")
             val data = element.data().substringAfter("sources: [").substringBefore("],")
             val sources = data.split("format: '").drop(1)
-            val videoList = mutableListOf<Video>()
             for (source in sources) {
                 val src = source.substringAfter("src: \"").substringBefore("\"")
                 val quality = source.substringBefore("'") // .substringAfter("format: '")
@@ -155,12 +169,12 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
 
-    // search
+    // ============================== search ==============================
 
     override fun searchAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
         anime.setUrlWithoutDomain(element.select("a").attr("href"))
-        anime.title = element.select("a > strong.hasyear").text()
+        anime.title = element.select("a > strong").text()
         anime.thumbnail_url = element.select("a > span.BG--GridItem").attr("data-lazy-style").substringAfter("-image:url(").substringBefore(");")
         return anime
     }
@@ -170,26 +184,36 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun searchAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val url = if (query.isBlank()) {
-            "$baseUrl/search/+/list/anime"
+        if (query.isNotBlank()) {
+            (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
+                when (filter) {
+                    is SearchCategoryList -> {
+                        val catQ = getSearchCategoryList()[filter.state].query
+                        val catUrl = "$baseUrl/search/$query/$catQ$page"
+                        return GET(catUrl, headers)
+                    }
+                    else -> {}
+                }
+            }
         } else {
             (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
                 when (filter) {
                     is CategoryList -> {
                         if (filter.state > 0) {
-                            val catQ = getCategoryList()[filter.state].name
-                            val catUrl = "$baseUrl/search/$query/list/$catQ/?page_number=$page"
+                            val catQ = getCategoryList()[filter.state].query
+                            val catUrl = "$baseUrl/category/$catQ/page/$page"
                             return GET(catUrl, headers)
                         }
                     }
+                    else -> {}
                 }
             }
             throw Exception("Choose a Filters")
         }
-        return GET(url, headers)
+        return GET(baseUrl, headers)
     }
 
-    // Details
+    // ============================== details ==============================
 
     override fun animeDetailsParse(document: Document): SAnime {
         val anime = SAnime.create()
@@ -209,39 +233,66 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return anime
     }
 
-    // Latest
+    // ============================== latest ==============================
+
+    override fun latestUpdatesSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
 
     override fun latestUpdatesNextPageSelector(): String = "ul.page-numbers li a.next"
 
     override fun latestUpdatesFromElement(element: Element): SAnime {
         val anime = SAnime.create()
         anime.setUrlWithoutDomain(element.select("a").attr("href"))
-        anime.title = element.select("a > strong.hasyear").text()
+        anime.title = element.select("a > strong").text()
         anime.thumbnail_url = element.select("a > span").attr("data-lazy-style").substringAfter("-image:url(").substringBefore(");")
         return anime
     }
 
     override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/page/$page")
 
-    override fun latestUpdatesSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
-
-    // Filters
+    // ============================== filters ==============================
 
     override fun getFilterList() = AnimeFilterList(
-        CategoryList(categoriesName),
+        AnimeFilter.Header("فلترات البحث"),
+        SearchCategoryList(searchCategoryNames),
+        AnimeFilter.Separator(),
+        AnimeFilter.Header("اقسام الموقع (تعمل فقط اذا كان البحث فارغ)"),
+        CategoryList(categoryNames)
     )
 
-    private class CategoryList(categories: Array<String>) : AnimeFilter.Select<String>("الأقسام", categories)
-    private data class CatUnit(val name: String)
-    private val categoriesName = getCategoryList().map {
+    private class SearchCategoryList(categories: Array<String>) : AnimeFilter.Select<String>("بحث عن", categories)
+    private class CategoryList(categories: Array<String>) : AnimeFilter.Select<String>("اختر قسم", categories)
+    private data class CatUnit(val name: String, val query: String)
+    private val searchCategoryNames = getSearchCategoryList().map {
+        it.name
+    }.toTypedArray()
+    private val categoryNames = getCategoryList().map {
         it.name
     }.toTypedArray()
 
+    private fun getSearchCategoryList() = listOf(
+        CatUnit("فيلم", "/page/"),
+        CatUnit("مسلسل", "list/series/?page_number="),
+        CatUnit("انمى", "list/anime/?page_number="),
+        CatUnit("برنامج", "list/tv/?page_number=")
+    )
     private fun getCategoryList() = listOf(
-        CatUnit("اختر"),
-        CatUnit("anime"),
-        CatUnit("series"),
-        CatUnit("tv")
+        CatUnit("اختر", ""),
+        CatUnit("جميع الافلام", "افلام"),
+        CatUnit("افلام اجنبى", "افلام/10-movies-english-افلام-اجنبي/"),
+        CatUnit("افلام عربى", "افلام/6-arabic-movies-افلام-عربي/"),
+        CatUnit("افلام هندى", "افلام/افلام-هندي-indian-movies/"),
+        CatUnit("افلام تركى", "افلام/افلام-تركى-turkish-films/"),
+        CatUnit("افلام وثائقية", "افلام/افلام-وثائقية-documentary-films/"),
+        CatUnit("افلام انمي", "افلام-كرتون/"),
+        CatUnit("سلاسل افلام", "افلام/10-movies-english-افلام-اجنبي/سلاسل-الافلام-الكاملة-full-pack/"),
+        CatUnit("مسلسلات", "مسلسلات"),
+        CatUnit("مسلسلات اجنبى", "مسلسلات/5-series-english-مسلسلات-اجنبي/"),
+        CatUnit("مسلسلات عربى", "مسلسلات/13-مسلسلات-عربيه-arabic-series/"),
+        CatUnit("مسلسلات هندى", "مسلسلات/9-series-indian-مسلسلات-هندية/"),
+        CatUnit("مسلسلات اسيوى", "مسلسلات/مسلسلات-اسيوية/"),
+        CatUnit("مسلسلات تركى", "مسلسلات/8-مسلسلات-تركية-turkish-series/"),
+        CatUnit("مسلسلات وثائقية", "مسلسلات/مسلسلات-وثائقية-documentary-series/"),
+        CatUnit("مسلسلات انمي", "مسلسلات-كرتون/"),
     )
 
     // preferred quality settings

src/ar/mycimamovie/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="eu.kanade.tachiyomi.animeextension" />

src/ar/mycimamovie/build.gradle

@@ -1,12 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-ext {
-    extName = 'MY CIMA MOVIES'
-    pkgNameSuffix = 'ar.mycimamovie'
-    extClass = '.MyCimaMovie'
-    extVersionCode = 12
-    libVersion = '13'
-}
-
-apply from: "$rootDir/common.gradle"

src/ar/mycimamovie/src/eu/kanade/tachiyomi/animeextension/ar/mycimamovie/MyCimaMovie.kt

@@ -1,239 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.mycimamovie
-
-import android.app.Application
-import android.content.SharedPreferences
-import androidx.preference.ListPreference
-import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
-import eu.kanade.tachiyomi.animesource.model.AnimeFilter
-import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
-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.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers.Companion.toHeaders
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.lang.Exception
-
-class MyCimaMovie : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
-
-    override val name = "MY Cima Movies"
-
-    override val baseUrl = "https://mycima.pw"
-
-    override val lang = "ar"
-
-    override val supportsLatest = true
-
-    override val client: OkHttpClient = network.cloudflareClient
-
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    // Popular Anime
-
-    override fun popularAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
-
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/category/افلام-كرتون/page/$page/")
-
-    override fun popularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.select("a").attr("href"))
-        anime.title = element.select("a strong.hasyear").text()
-        anime.thumbnail_url =
-            element.select("a > span.BG--GridItem")
-                .attr("data-lazy-style")
-                .substringAfter("-image:url(")
-                .substringBefore(");")
-        return anime
-    }
-
-    override fun popularAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
-
-    // Episodes
-
-    override fun episodeListSelector() = "div.Poster--Single-begin > a"
-
-    override fun episodeFromElement(element: Element): SEpisode {
-        val episode = SEpisode.create()
-        episode.setUrlWithoutDomain(element.attr("abs:href"))
-        episode.name = element.ownerDocument().select("div.Title--Content--Single-begin > h1").text() // "movie"
-        return episode
-    }
-
-    // Video urls
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val iframe = document.selectFirst("iframe").attr("data-lazy-src")
-        val referer = response.request.url.encodedPath
-        val newHeaderList = mutableMapOf(Pair("referer", baseUrl + referer))
-        headers.forEach { newHeaderList[it.first] = it.second }
-        val iframeResponse = client.newCall(GET(iframe, newHeaderList.toHeaders()))
-            .execute().asJsoup()
-        return videosFromElement(iframeResponse.selectFirst(videoListSelector()))
-    }
-
-    override fun videoListSelector() = "body"
-
-    private fun videosFromElement(element: Element): List<Video> {
-        val videoList = mutableListOf<Video>()
-        val script = element.select("script")
-            .firstOrNull { it.data().contains("player.qualityselector({") }
-        if (script != null) {
-            val scriptV = element.select("script:containsData(source)")
-            val data = element.data().substringAfter("sources: [").substringBefore("],")
-            val sources = data.split("format: '").drop(1)
-            val videoList = mutableListOf<Video>()
-            for (source in sources) {
-                val src = source.substringAfter("src: \"").substringBefore("\"")
-                val quality = source.substringBefore("'") // .substringAfter("format: '")
-                val video = Video(src, quality, src)
-                videoList.add(video)
-            }
-            return videoList
-        }
-        val sourceTag = element.ownerDocument().select("source").firstOrNull()!!
-        return listOf(Video(sourceTag.attr("src"), "Default", sourceTag.attr("src")))
-    }
-
-    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 videoFromElement(element: Element) = throw Exception("not used")
-
-    override fun videoUrlParse(document: Document) = throw Exception("not used")
-
-    // search
-
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.select("a").attr("href"))
-        anime.title = element.select("a > strong.hasyear").text()
-        anime.thumbnail_url = element.select("a > span.BG--GridItem").attr("data-lazy-style").substringAfter("-image:url(").substringBefore(");")
-        return anime
-    }
-
-    override fun searchAnimeNextPageSelector(): String = "ul.page-numbers li a.next"
-
-    override fun searchAnimeSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
-
-    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val url = if (query.isNotBlank()) {
-            "$baseUrl/search/$query/page/$page"
-        } else {
-            (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
-                when (filter) {
-                    is CategoryList -> {
-                        if (filter.state > 0) {
-                            val catQ = getCategoryList()[filter.state].name
-                            val catUrl = "$baseUrl/$catQ/page/$page"
-                            return GET(catUrl, headers)
-                        }
-                    }
-                }
-            }
-            throw Exception("Choose a Filters")
-        }
-        return GET(url, headers)
-    }
-
-    // Details
-
-    override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create()
-        anime.title = document.select("div.Title--Content--Single-begin > h1").text()
-        anime.genre = document.select("li:contains(التصنيف) > p > a, li:contains(النوع) > p > a").joinToString(", ") { it.text() }
-        anime.description = document.select("div.AsideContext > div.StoryMovieContent, div.PostItemContent").text()
-        anime.author = document.select("li:contains(شركات الإنتاج) > p > a").joinToString(", ") { it.text() }
-        // add alternative name to anime description
-        document.select("li:contains( بالعربي) > p, li:contains(معروف) > p").text()?.let {
-            if (it.isEmpty().not()) {
-                anime.description += when {
-                    anime.description!!.isEmpty() -> "Alternative Name: $it"
-                    else -> "\n\nAlternativ Name: $it"
-                }
-            }
-        }
-        return anime
-    }
-
-    // Latest
-
-    override fun latestUpdatesNextPageSelector(): String = "ul.page-numbers li a.next"
-
-    override fun latestUpdatesFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.select("a").attr("href"))
-        anime.title = element.select("a > strong.hasyear").text()
-        anime.thumbnail_url = element.select("a > span").attr("data-lazy-style").substringAfter("-image:url(").substringBefore(");")
-        return anime
-    }
-
-    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/movies/recent/page/$page/")
-
-    override fun latestUpdatesSelector(): String = "div.Grid--MycimaPosts div.GridItem div.Thumb--GridItem"
-
-    // Filters
-
-    override fun getFilterList() = AnimeFilterList(
-        CategoryList(categoriesName),
-    )
-
-    private class CategoryList(categories: Array<String>) : AnimeFilter.Select<String>("الأقسام", categories)
-    private data class CatUnit(val name: String)
-    private val categoriesName = getCategoryList().map {
-        it.name
-    }.toTypedArray()
-
-    private fun getCategoryList() = listOf(
-        CatUnit("اختر"),
-        CatUnit("category/افلام-كرتون"),
-        CatUnit("movies/best")
-    )
-
-    // preferred quality settings
-
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
-            title = "Preferred quality"
-            entries = arrayOf("1080p", "720p", "480p", "360p", "240p")
-            entryValues = arrayOf("1080", "720", "480", "360", "240")
-            setDefaultValue("1080")
-            summary = "%s"
-
-            setOnPreferenceChangeListener { _, newValue ->
-                val selected = newValue as String
-                val index = findIndexOfValue(selected)
-                val entry = entryValues[index] as String
-                preferences.edit().putString(key, entry).commit()
-            }
-        }
-        screen.addPreference(videoQualityPref)
-    }
-}