From 55c970dc6ff29ea79327ed657118f5034f6f6bd2 Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sat, 21 Oct 2023 14:01:29 -0600
Subject: [PATCH 01/11] updates

---
 .../lib/voeextractor/VoeExtractor.kt          |   7 +-
 src/es/animeflv/build.gradle                  |   3 +-
 .../animeextension/es/animeflv/AnimeFlv.kt    | 100 +++---
 src/es/animemovil/build.gradle                |   2 +-
 .../es/animemovil/AnimeMovil.kt               |  99 +++---
 src/es/cuevana/build.gradle                   |  18 +-
 .../animeextension/es/cuevana/CuevanaCh.kt    | 273 +++++++++++------
 .../es/cuevana/CuevanaFactory.kt              |   4 +-
 src/es/gnula/build.gradle                     |  11 +-
 .../animeextension/es/gnula/Gnula.kt          | 287 +++++++++++-------
 src/es/hentaila/build.gradle                  |   4 +-
 .../hentaila/res/mipmap-hdpi/ic_launcher.png  | Bin 11997 -> 2226 bytes
 .../hentaila/res/mipmap-mdpi/ic_launcher.png  | Bin 11997 -> 1197 bytes
 .../hentaila/res/mipmap-xhdpi/ic_launcher.png | Bin 11997 -> 2815 bytes
 .../res/mipmap-xxhdpi/ic_launcher.png         | Bin 11997 -> 4764 bytes
 .../res/mipmap-xxxhdpi/ic_launcher.png        | Bin 11997 -> 7021 bytes
 .../animeextension/es/hentaila/Hentaila.kt    | 125 ++++----
 src/es/jkanime/build.gradle                   |   3 +-
 .../animeextension/es/jkanime/Jkanime.kt      | 124 +++++---
 src/es/locopelis/build.gradle                 |   2 +-
 .../animeextension/es/locopelis/LocoPelis.kt  |  95 +++---
 src/es/metroseries/build.gradle               |   2 +-
 .../es/metroseries/MetroSeries.kt             | 199 ++++++++----
 src/es/pelisforte/build.gradle                |   2 +-
 .../es/pelisforte/PelisForte.kt               |   8 +-
 src/es/pelisplushd/build.gradle               |   7 +-
 .../es/pelisplushd/Pelisplushd.kt             | 287 +++++++++++-------
 .../es/pelisplushd/Pelisplusph.kt             | 253 ++++++++++-----
 .../es/pelisplushd/Pelisplusto.kt             | 240 ++++++++++-----
 29 files changed, 1362 insertions(+), 793 deletions(-)

diff --git a/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt b/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt
index 5bda3d466e..53a86fc819 100644
--- a/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt
+++ b/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt
@@ -6,14 +6,17 @@ import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.OkHttpClient
 
 class VoeExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String? = null): Video? {
+    fun videoFromUrl(url: String, quality: String? = null, prefix: String = ""): Video? {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val script = document.selectFirst("script:containsData(const sources),script:containsData(var sources)")
             ?.data()
             ?: return null
         val videoUrl = script.substringAfter("hls': '").substringBefore("'")
         val resolution = script.substringAfter("video_height': ").substringBefore(",")
-        val qualityStr = quality ?: "VoeCDN(${resolution}p)"
+        val qualityStr = when {
+            prefix.isNotEmpty() -> "$prefix${resolution}p"
+            else -> quality ?: "VoeCDN(${resolution}p)"
+        }
         return Video(url, qualityStr, videoUrl)
     }
 }
diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle
index f544349c9c..7a3e7be740 100644
--- a/src/es/animeflv/build.gradle
+++ b/src/es/animeflv/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
 
 ext {
     extName = 'AnimeFLV'
     pkgNameSuffix = 'es.animeflv'
     extClass = '.AnimeFlv'
-    extVersionCode = 50
+    extVersionCode = 51
     libVersion = '13'
 }
 
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
index 25e17772ba..49db2620e9 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
@@ -41,7 +41,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val lang = "es"
 
-    override val supportsLatest = false
+    override val supportsLatest = true
 
     override val client: OkHttpClient = network.cloudflareClient
 
@@ -51,24 +51,30 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "YourUpload"
+        private val SERVER_LIST = arrayOf("MailRu", "Okru", "YourUpload", "DoodStream", "StreamTape")
+    }
+
     override fun popularAnimeSelector(): String = "div.Container ul.ListAnimes li article"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/browse?order=rating&page=$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
-        anime.setUrlWithoutDomain(
-            baseUrl + element.select("div.Description a.Button")
-                .attr("href"),
-        )
+        anime.setUrlWithoutDomain(element.select("div.Description a.Button").attr("abs:href"))
         anime.title = element.select("a h3").text()
         anime.thumbnail_url = try {
             element.select("a div.Image figure img").attr("src")
         } catch (e: Exception) {
             element.select("a div.Image figure img").attr("data-cfsrc")
         }
-        anime.description =
-            element.select("div.Description p:eq(2)").text().removeSurrounding("\"")
+        anime.description = element.select("div.Description p:eq(2)").text().removeSurrounding("\"")
         return anime
     }
 
@@ -127,7 +133,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                 val docHeaders = headers.newBuilder()
                                     .add("Referer", "$baseUrl/")
                                     .build()
-                                StreamWishExtractor(client, docHeaders).videosFromUrl(url, "StreamWish")
+                                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" })
                             }
                             else -> null
                         }
@@ -145,27 +151,6 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
-    override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "Okru:720p")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
-    private fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
-    }
-
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
@@ -278,9 +263,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         fun toUriPart() = vals[state].second
     }
 
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        return popularAnimeFromElement(element)
-    }
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
 
     override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
 
@@ -288,7 +271,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun animeDetailsParse(document: Document): SAnime {
         val anime = SAnime.create()
-        anime.thumbnail_url = externalOrInternalImg(document.selectFirst("div.AnimeCover div.Image figure img")!!.attr("src"))
+        anime.thumbnail_url = document.selectFirst("div.AnimeCover div.Image figure img")!!.attr("abs:src")
         anime.title = document.selectFirst("div.Ficha.fchlt div.Container .Title")!!.text()
         anime.description = document.selectFirst("div.Description")!!.text().removeSurrounding("\"")
         anime.genre = document.select("nav.Nvgnrs a").joinToString { it.text() }
@@ -296,10 +279,6 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return anime
     }
 
-    private fun externalOrInternalImg(url: String): String {
-        return if (url.contains("https")) url else "$baseUrl/$url"
-    }
-
     private fun parseStatus(statusString: String): Int {
         return when {
             statusString.contains("En emision") -> SAnime.ONGOING
@@ -316,19 +295,41 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = arrayOf(
-                "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", "Okru:144p", // Okru
-                "YourUpload", "DoodStream", "StreamTape",
-            ) // video servers without resolution
-            entryValues = arrayOf(
-                "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", "Okru:144p", // Okru
-                "YourUpload", "DoodStream", "StreamTape",
-            ) // video servers without resolution
-            setDefaultValue("Okru:720p")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -337,7 +338,6 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/animemovil/build.gradle b/src/es/animemovil/build.gradle
index 6bb8b2df5c..c4dc64d7bc 100644
--- a/src/es/animemovil/build.gradle
+++ b/src/es/animemovil/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'AnimeMovil'
     pkgNameSuffix = 'es.animemovil'
     extClass = '.AnimeMovil'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '13'
 }
 
diff --git a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
index f60c88d536..54f31bb11e 100644
--- a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
+++ b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
@@ -58,6 +58,21 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "PlusTube", "PlusVid", "PlusIm", "PlusWish", "PlusHub", "PlusDex",
+            "YourUpload", "Voe", "StreamWish", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "PlusFilm",
+            "Fastream",
+        )
+    }
+
     override fun popularAnimeRequest(page: Int) = GET("$baseUrl/directorio/?p=$page", headers)
 
     override fun popularAnimeParse(response: Response): AnimesPage {
@@ -203,7 +218,7 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
                                 videoList.add(Video(fileSrc, "$serverName:HLS", fileSrc, headers = null))
                             }
                             if (fileSrc.contains(".mp4")) {
-                                videoList.add(Video(fileSrc, serverName, fileSrc, headers = null))
+                                videoList.add(Video(fileSrc, "$serverName:MP4", fileSrc, headers = null))
                             }
                         }
                     } else {
@@ -222,65 +237,59 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, "Voe")?.let { videoList.add(it) }
+                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
             }
             if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
-                FilemoonExtractor(client).videosFromUrl(url).also(videoList::addAll)
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:").also(videoList::addAll)
             }
             if (embedUrl.contains("uqload")) {
-                UqloadExtractor(client).videosFromUrl(url)
+                UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if (embedUrl.contains("mp4upload")) {
                 val newHeaders = headers.newBuilder().add("referer", "https://re.animepelix.net/").build()
-                Mp4uploadExtractor(client).videosFromUrl(url, newHeaders).let { videoList.addAll(it) }
+                Mp4uploadExtractor(client).videosFromUrl(url, newHeaders).also(videoList::addAll)
             }
             if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("wish")) {
                 val docHeaders = headers.newBuilder()
                     .add("Referer", "$baseUrl/")
                     .build()
-                StreamWishExtractor(client, docHeaders).videosFromUrl(url, "StreamWish")
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
             }
             if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
                 DoodExtractor(client).videoFromUrl(url, "DoodStream", false)?.let { videoList.add(it) }
             }
             if (embedUrl.contains("streamlare")) {
-                videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
+                StreamlareExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if (embedUrl.contains("yourupload")) {
-                YourUploadExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers).also(videoList::addAll)
             }
             if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
-                BurstCloudExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers).also(videoList::addAll)
             }
             if (embedUrl.contains("fastream")) {
-                FastreamExtractor(client).videoFromUrl(url).forEach { videoList.add(it) }
+                FastreamExtractor(client).videoFromUrl(url).also(videoList::addAll)
             }
             if (embedUrl.contains("upstream")) {
-                UpstreamExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+                UpstreamExtractor(client).videosFromUrl(url).also(videoList::addAll)
             }
             if (embedUrl.contains("streamtape")) {
-                StreamTapeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
+                StreamTapeExtractor(client).videoFromUrl(url)?.also(videoList::add)
             }
         } catch (_: Exception) {}
         return videoList
     }
 
     override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "Voe")
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality == quality) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
@@ -396,19 +405,28 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "PlusTube", "PlusVid", "PlusIm", "PlusWish", "PlusHub", "PlusDex",
-            "YourUpload", "BurstCloud", "Voe", "StreamWish", "Mp4Upload", "Doodstream",
-            "Upload", "BurstCloud", "Upstream", "StreamTape", "PlusFilm", "Doodstream",
-            "Fastream:1080p", "Fastream:720p", "Fastream:480p", "Fastream:360p",
-            "Filemoon:1080p", "Filemoon:720p", "Filemoon:480p", "Filemoon:360p",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Voe")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -417,8 +435,7 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
     }
 
     @Serializable
diff --git a/src/es/cuevana/build.gradle b/src/es/cuevana/build.gradle
index 632a1553df..f7503ede1a 100644
--- a/src/es/cuevana/build.gradle
+++ b/src/es/cuevana/build.gradle
@@ -6,18 +6,26 @@ ext {
     extName = 'Cuevana'
     pkgNameSuffix = 'es.cuevana'
     extClass = '.CuevanaFactory'
-    extVersionCode = 23
+    extVersionCode = 24
     libVersion = '13'
 }
 
 dependencies {
+    implementation(project(':lib-vudeo-extractor'))
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib-streamlare-extractor'))
     implementation(project(':lib-yourupload-extractor'))
+    implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-dood-extractor'))
-    implementation project(path: ':lib-okru-extractor')
-    implementation project(path: ':lib-voe-extractor')
-    implementation project(path: ':lib-streamtape-extractor')
-    implementation project(path: ':lib-filemoon-extractor')
+    implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib-burstcloud-extractor'))
+    implementation(project(':lib-fastream-extractor'))
+    implementation(project(':lib-upstream-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
 
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
index 5141e3a9e5..fc133397bc 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
@@ -11,10 +11,17 @@ 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.burstcloudextractor.BurstCloudExtractor
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -22,6 +29,7 @@ import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -46,6 +54,25 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[SUB]", "[CAST]")
+
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+            "Tomatomatela",
+        )
+    }
+
     override fun popularAnimeSelector(): String = ".MovieList .TPostMv .TPost"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/peliculas?page=$page")
@@ -71,10 +98,18 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
                     idxSeason
                 }
                 season.select(".TPostMv article.TPost").reversed().mapIndexed { idxCap, cap ->
-                    val epNum = try { cap.select("a div.Image span.Year").text().substringAfter("x").toFloat() } catch (e: Exception) { idxCap.toFloat() }
+                    val epNum = try {
+                        cap.select("a div.Image span.Year").text().substringAfter("x").toFloat()
+                    } catch (e: Exception) {
+                        idxCap.toFloat()
+                    }
                     val episode = SEpisode.create()
                     val date = cap.select("a > p").text()
-                    val epDate = try { SimpleDateFormat("yyyy-MM-dd").parse(date) } catch (e: Exception) { null }
+                    val epDate = try {
+                        SimpleDateFormat("yyyy-MM-dd").parse(date)
+                    } catch (e: Exception) {
+                        null
+                    }
                     episode.episode_number = epNum
                     episode.name = "T$noSeason - Episodio $epNum"
                     if (epDate != null) episode.date_upload = epDate.time
@@ -112,103 +147,120 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
                 } else {
                     ""
                 }
-            } catch (e: Exception) { "" }
+            } catch (e: Exception) {
+                ""
+            }
             val url = it.attr("abs:data-video")
             try {
-                loadExtractor(url, langPrefix).map { video -> videoList.add(video) }
+                serverVideoResolver(url, langPrefix).also(videoList::addAll)
             } catch (_: Exception) { }
         }
 
         return videoList
     }
 
-    private fun loadExtractor(url: String, prefix: String = ""): List<Video> {
+    private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
         val videoList = mutableListOf<Video>()
         val embedUrl = url.lowercase()
-        if (embedUrl.contains("tomatomatela")) {
-            try {
-                val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
-                val headers = headers.newBuilder()
-                    .set("authority", mainUrl)
-                    .set("accept", "application/json, text/javascript, */*; q=0.01")
-                    .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
-                    .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
-                    .set("sec-ch-ua-mobile", "?0")
-                    .set("sec-ch-ua-platform", "Windows")
-                    .set("sec-fetch-dest", "empty")
-                    .set("sec-fetch-mode", "cors")
-                    .set("sec-fetch-site", "same-origin")
-                    .set("x-requested-with", "XMLHttpRequest")
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val body = client.newCall(GET(url)).execute().asJsoup()
+                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                        .substringAfter("shareId = \"").substringBefore("\"")
+                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                        .execute().asJsoup()
+                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                    val amazonApi =
+                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                            .execute().asJsoup()
+                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                    videoList.add(Video(videoUrl, "$prefix Amazon", videoUrl))
+                }
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
                     .build()
-                val token = url.substringAfter("/embed.html#")
-                val urlRequest = "https://$mainUrl/details.php?v=$token"
-                val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
-                val bodyText = response.select("body").text()
-                val json = json.decodeFromString<JsonObject>(bodyText)
-                val status = json["status"]!!.jsonPrimitive!!.content
-                val file = json["file"]!!.jsonPrimitive!!.content
-                if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
-            } catch (_: Exception) { }
-        }
-        if (embedUrl.contains("yourupload")) {
-            val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            videoList.addAll(videos)
-        }
-        if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
-            DoodExtractor(client).videoFromUrl(url, "$prefix DoodStream", false)
-                ?.let { videoList.add(it) }
-        }
-
-        if (embedUrl.contains("okru")) {
-            videoList.addAll(
-                OkruExtractor(client).videosFromUrl(url, prefix, true),
-            )
-        }
-        if (embedUrl.contains("voe")) {
-            VoeExtractor(client).videoFromUrl(url, "$prefix Voe")?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("streamtape")) {
-            StreamTapeExtractor(client).videoFromUrl(url, "$prefix StreamTape")?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("wish")) {
-            StreamWishExtractor(client, headers).videosFromUrl(url) { "$prefix StreamWish:$it" }
-                .also(videoList::addAll)
-        }
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "$prefix Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish")) {
+                val docHeaders = headers.newBuilder()
+                    .add("Origin", "https://streamwish.to")
+                    .add("Referer", "https://streamwish.to/")
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "$prefix StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                DoodExtractor(client).videoFromUrl(url2, "$prefix DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url, prefix = "$prefix Fastream:").forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("tomatomatela")) {
+                runCatching {
+                    val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
+                    val headers = headers.newBuilder()
+                        .set("authority", mainUrl)
+                        .set("accept", "application/json, text/javascript, */*; q=0.01")
+                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                        .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
+                        .set("sec-ch-ua-mobile", "?0")
+                        .set("sec-ch-ua-platform", "Windows")
+                        .set("sec-fetch-dest", "empty")
+                        .set("sec-fetch-mode", "cors")
+                        .set("sec-fetch-site", "same-origin")
+                        .set("x-requested-with", "XMLHttpRequest")
+                        .build()
+                    val token = url.substringAfter("/embed.html#")
+                    val urlRequest = "https://$mainUrl/details.php?v=$token"
+                    val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
+                    val bodyText = response.select("body").text()
+                    val json = json.decodeFromString<JsonObject>(bodyText)
+                    val status = json["status"]!!.jsonPrimitive!!.content
+                    val file = json["file"]!!.jsonPrimitive!!.content
+                    if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
+                }
+            }
+        } catch (_: Exception) { }
         return videoList
     }
 
-    private fun urlServerSolver(url: String): String = if (url.startsWith("https")) url else if (url.startsWith("//")) "https:$url" else "$baseUrl/$url"
-
-    private fun fetchUrls(text: String?): List<String> {
-        if (text.isNullOrEmpty()) return listOf()
-        val linkRegex = Regex("""(https?://(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))""")
-        return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
-    }
-
     override fun videoListSelector() = throw Exception("not used")
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
 
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
-    override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "Voex")
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality == quality) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
-    }
-
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
@@ -275,22 +327,48 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
         ),
     )
 
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
     private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
         AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
         fun toUriPart() = vals[state].second
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Streamlare:1080p", "Streamlare:720p", "Streamlare:480p", "Streamlare:360p", "Streamlare:240p", // Streamlare
-            "StreamTape", "Amazon", "Voex", "DoodStream", "YourUpload",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Voex")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -299,7 +377,22 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaFactory.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaFactory.kt
index f201c98901..895ebb7b60 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaFactory.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaFactory.kt
@@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.animesource.AnimeSourceFactory
 
 class CuevanaFactory : AnimeSourceFactory {
     override fun createSources(): List<AnimeSource> = listOf(
-        CuevanaCh("Cuevana3Ch", "https://www12.cuevana3.ch"),
-        CuevanaEu("Cuevana3Eu", "https://www.cuevana-3.eu"),
+        CuevanaCh("Cuevana3Ch", "https://ww1.cuevana3.ch"),
+        CuevanaEu("Cuevana3Eu", "https://www.cuevana3.eu"),
     )
 }
diff --git a/src/es/gnula/build.gradle b/src/es/gnula/build.gradle
index f5ad384f5c..fa113655ed 100644
--- a/src/es/gnula/build.gradle
+++ b/src/es/gnula/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Gnula'
     pkgNameSuffix = 'es.gnula'
     extClass = '.Gnula'
-    extVersionCode = 8
+    extVersionCode = 9
     libVersion = '13'
 }
 
@@ -15,6 +15,15 @@ dependencies {
     implementation project(path: ':lib-yourupload-extractor')
     implementation project(path: ':lib-voe-extractor')
     implementation project(path: ':lib-dood-extractor')
+    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib-fastream-extractor'))
+    implementation(project(':lib-upstream-extractor'))
+    implementation(project(':lib-burstcloud-extractor'))
+    implementation(project(':lib-streamhidevid-extractor'))
+    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib-streamwish-extractor'))
 }
 
 
diff --git a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
index c84de1ec4a..560df41df2 100644
--- a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
+++ b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
@@ -13,19 +13,28 @@ 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.burstcloudextractor.BurstCloudExtractor
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -50,12 +59,29 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     private val json: Json by injectLazy()
 
-    private val langValues = arrayOf("latino", "spanish", "english", "")
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        const val PREF_QUALITY_KEY = "preferred_quality"
+        const val PREF_QUALITY_DEFAULT = "1080"
+        val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+            "StreamHideVid",
+        )
+
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[CAST]", "[SUB]")
+        private val LANGUAGE_LIST_VALUES = arrayOf("latino", "spanish", "english")
+    }
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/archives/movies/releases/page/$page")
 
     override fun popularAnimeParse(response: Response): AnimesPage {
@@ -130,7 +156,6 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val videoList = mutableListOf<Video>()
-        val langSelect = preferences.getString("preferred_lang", "latino").toString()
 
         if (response.request.url.toString().contains("/movies/")) {
             document.select("script").forEach { script ->
@@ -139,26 +164,11 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     val props = jObject["props"]!!.jsonObject
                     val pageProps = props["pageProps"]!!.jsonObject
                     val post = pageProps["post"]!!.jsonObject
-                    var players = if (langSelect != "") {
-                        post["players"]!!.jsonObject.entries.filter { x -> x.key == langSelect && x.value.jsonArray.any() }.toList()
-                    } else {
-                        post["players"]!!.jsonObject.entries.toList()
-                    }
-
-                    if (!players.any()) {
-                        langValues.filter { x -> x != langSelect }.forEach { tmpLang ->
-                            if (!players.any()) {
-                                players = if (langSelect != "") {
-                                    post["players"]!!.jsonObject.entries.filter { x -> x.key == tmpLang && x.value.jsonArray.any() }.toList()
-                                } else {
-                                    post["players"]!!.jsonObject.entries.toList()
-                                }
-                            }
-                        }
-                    }
-
-                    players.map {
-                        val lang = it.key.split(" ").joinToString(separator = " ", transform = String::capitalize)
+                    post["players"]!!.jsonObject.entries.map {
+                        val key = it.key
+                        val langVal = try {
+                            LANGUAGE_LIST[LANGUAGE_LIST.indexOf(LANGUAGE_LIST_VALUES.firstOrNull { it == key })]
+                        } catch (_: Exception) { "" }
                         it.value!!.jsonArray!!.map {
                             val server = it!!.jsonObject["result"]!!.jsonPrimitive!!.content
                             var url = ""
@@ -167,7 +177,7 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                     url = sc.data().substringAfter("var url = '").substringBefore("';")
                                 }
                             }
-                            loadExtractor(url, lang).let { videos -> videoList.addAll(videos) }
+                            serverVideoResolver(url, langVal).let { videos -> videoList.addAll(videos) }
                         }
                     }
                 }
@@ -179,10 +189,13 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     val props = jObject["props"]!!.jsonObject
                     val pageProps = props["pageProps"]!!.jsonObject
                     val episode = pageProps["episode"]!!.jsonObject
-                    val players = episode["players"]!!.jsonObject.entries.filter { x -> x.key == langSelect }
-                        .ifEmpty { episode["players"]!!.jsonObject.entries }
+                    val players = episode["players"]!!.jsonObject.entries
                     players.map {
-                        val lang = it.key.split(" ").joinToString(separator = " ", transform = String::capitalize)
+                        val key = it.key
+                        val langVal = try {
+                            LANGUAGE_LIST[LANGUAGE_LIST.indexOf(LANGUAGE_LIST_VALUES.firstOrNull { it == key })]
+                        } catch (_: Exception) { "" }
+
                         it.value!!.jsonArray!!.map {
                             val server = it!!.jsonObject["result"]!!.jsonPrimitive!!.content
                             var url = ""
@@ -191,7 +204,7 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                                     url = sc.data().substringAfter("var url = '").substringBefore("';")
                                 }
                             }
-                            loadExtractor(url, lang).let { videos -> videoList.addAll(videos) }
+                            serverVideoResolver(url, langVal).let { videos -> videoList.addAll(videos) }
                         }
                     }
                 }
@@ -200,74 +213,117 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return videoList
     }
 
-    private fun loadExtractor(url: String, prefix: String = ""): List<Video> {
+    private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
         val videoList = mutableListOf<Video>()
         val embedUrl = url.lowercase()
-        if (embedUrl.contains("tomatomatela")) {
-            try {
-                val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
-                val headers = headers.newBuilder()
-                    .set("authority", mainUrl)
-                    .set("accept", "application/json, text/javascript, */*; q=0.01")
-                    .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
-                    .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
-                    .set("sec-ch-ua-mobile", "?0")
-                    .set("sec-ch-ua-platform", "Windows")
-                    .set("sec-fetch-dest", "empty")
-                    .set("sec-fetch-mode", "cors")
-                    .set("sec-fetch-site", "same-origin")
-                    .set("x-requested-with", "XMLHttpRequest")
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val body = client.newCall(GET(url)).execute().asJsoup()
+                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                        .substringAfter("shareId = \"").substringBefore("\"")
+                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                        .execute().asJsoup()
+                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                    val amazonApi =
+                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                            .execute().asJsoup()
+                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                    videoList.add(Video(videoUrl, "$prefix Amazon", videoUrl))
+                }
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
                     .build()
-                val token = url.substringAfter("/embed.html#")
-                val urlRequest = "https://$mainUrl/details.php?v=$token"
-                val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
-                val bodyText = response.select("body").text()
-                val json = json.decodeFromString<JsonObject>(bodyText)
-                val status = json["status"]!!.jsonPrimitive!!.content
-                val file = json["file"]!!.jsonPrimitive!!.content
-                if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
-            } catch (e: Exception) { }
-        }
-        if (embedUrl.contains("yourupload")) {
-            val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            videoList.addAll(videos)
-        }
-        if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
-            DoodExtractor(client).videoFromUrl(url, "$prefix DoodStream", false)?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("okru")) {
-            videoList.addAll(
-                OkruExtractor(client).videosFromUrl(url, prefix, true),
-            )
-        }
-        if (embedUrl.contains("voe")) {
-            VoeExtractor(client).videoFromUrl(url, quality = "$prefix Voex")?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("streamtape")) {
-            StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")?.let { videoList.add(it) }
-        }
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "$prefix Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish")) {
+                val docHeaders = headers.newBuilder()
+                    .add("Origin", "https://streamwish.to")
+                    .add("Referer", "https://streamwish.to/")
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "$prefix StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                DoodExtractor(client).videoFromUrl(url2, "$prefix DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url, prefix = "$prefix Fastream:").forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
+                StreamHideVidExtractor(client).videosFromUrl(url, "$prefix ").let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("tomatomatela")) {
+                runCatching {
+                    val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
+                    val headers = headers.newBuilder()
+                        .set("authority", mainUrl)
+                        .set("accept", "application/json, text/javascript, */*; q=0.01")
+                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                        .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
+                        .set("sec-ch-ua-mobile", "?0")
+                        .set("sec-ch-ua-platform", "Windows")
+                        .set("sec-fetch-dest", "empty")
+                        .set("sec-fetch-mode", "cors")
+                        .set("sec-fetch-site", "same-origin")
+                        .set("x-requested-with", "XMLHttpRequest")
+                        .build()
+                    val token = url.substringAfter("/embed.html#")
+                    val urlRequest = "https://$mainUrl/details.php?v=$token"
+                    val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
+                    val bodyText = response.select("body").text()
+                    val json = json.decodeFromString<JsonObject>(bodyText)
+                    val status = json["status"]!!.jsonPrimitive!!.content
+                    val file = json["file"]!!.jsonPrimitive!!.content
+                    if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
+                }
+            }
+        } catch (_: Exception) { }
         return videoList
     }
 
     override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "Okru:1080p")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
-    private fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
@@ -339,16 +395,12 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", "Okru:144p", // Okru
-            "Uqload", "Upload", "SolidFiles", "StreamTape", "DoodStream", "Voex", // video servers without resolution
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
-            title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Okru:1080p")
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -357,14 +409,14 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-
-        val langPref = ListPreference(screen.context).apply {
-            key = "preferred_lang"
-            title = "Preferred language"
-            entries = arrayOf("Latino", "Español", "Subtitulado", "Todos")
-            entryValues = langValues
-            setDefaultValue("latino")
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -373,10 +425,23 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
+            title = "Preferred quality"
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
+            summary = "%s"
 
-        screen.addPreference(videoQualityPref)
-        screen.addPreference(langPref)
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
     }
 
     // Not Used
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index f5ea158c11..1f9c71d0c7 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -3,10 +3,10 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
 
 ext {
-    extName = 'Hentaila'
+    extName = 'HentaiLA'
     pkgNameSuffix = 'es.hentaila'
     extClass = '.Hentaila'
-    extVersionCode = 17
+    extVersionCode = 18
     libVersion = '13'
     containsNsfw = true
 }
diff --git a/src/es/hentaila/res/mipmap-hdpi/ic_launcher.png b/src/es/hentaila/res/mipmap-hdpi/ic_launcher.png
index be66e4e24670941f8b8c065ece038b644aec9991..f4ec829df38bb4d3f155dc23966ae8fc2340e2b6 100644
GIT binary patch
literal 2226
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
AK>z>%

literal 11997
zcmeHt_ghn6voEMf6G22kkfMl44ZRbj_fF_VO6Z+HAcP{lqew>xf>Nb-LYJbn(0ehU
z^j<^1@q6BL?tAXPaNi&He)g<A^O?0~&7Rpa&x+DiS0EvxA;Q7IAyHD4)yBcW1!6B6
zg8SH!NIWqz9Gp9>_PPcT12t7qD_3VO3u{+PFqe<B8}>a8j<}?cn}wAl7{X`?wzYSW
zVA(^qu`t?OOR(q*sBx>g$$;(b6=5D=9hkbV70l5}#F|ACNF?qfiUn{6Lo675oSj@e
zMSUb#{=pT+KK~sCurU6^0&$dJk@~BUQO?KB1MKO^f))0#wh`5qmH(G0mXctxgFxIw
z0RSiz$_3@)a`mtU@Q8?r0JwPpyu6%P4o**B7l?%qr;8^O7J=~}2wAYFm503>#NO3~
z@h_x>rK=Z2f`x^M@n6W+R{sO+=H=n^53IEn0PF;I2D?B!0X$qhfd9*lU690!f6c?i
z^IvAd8VulL;f7`92D~6*#HwZ#x3&_s@&H>vTs{7h|1}pKu=_v6e^E~MKoK4hZaxt{
zK^}fVetsc7alqdhV#oiH_=otHh&bSX<B4PEAu97<_`0sHPQd?VK1O~nZZ2+4Yp^%i
z$<>XEPk=`p@c#;6&GV0ff3pwP=>H61t^W7%e|8T`{LlV_U9g+(f!*B@%!(-v4kM0|
ztdy>g*-jSzTaesj?^<i>A~6|^L_impH8<x4yEZ5qa?h0FNtfB==|(i(6ZXO&2wAe+
z1_2SJ=9i*S8b%7%=U);}6VG;`tFJnOlonf{E@slJl1Pr3=5#*K0KPL+vlyQ(Mfklt
zj5v1^A8EckqS_6{Aqc_=*|#7I!XZ#p!0BW$P5o{`hJ#DM(1U#w1i8luAN3M>b|054
zXy4+&f0+Jbg8zTLKtC|m(SN$t-w)s&?t6JraPM5W<?b_efY@zI>fmbCA7S0q-ZT|Z
zGRMVA>BVb7Ijtj8)aP3aZ(#T5)!TU9!=$Xz>p!{8v!nqc9JfN}O8s(e!+ra=-vdtp
zHRn*Ev3gL(PU<J~kK{SCRn@gH(|`b?e#?O=fX;!{jc&qLRi&MdlY@ic%n=K6MzC~X
z$$6-rfg;USMI{|C5dZh>&H$si0FrHHaD4M<B48+YHF0DcE@|4Dp1L`RGXACdxf)NH
zXlwPx4)40k&;eJb{27v6@u!~Wjv1F<er`VIa#lLaw+>=n5O<0G&g;2d)M{8D?dh?y
zynN_Wd%U(+cN<46=^Kd?ijv7GFYIC4Ro<Dc^)DD-pWMx8pREU-oVdQ#*{L;&E+Nv{
z@Lf^TT9?u}m&qUXR6_xn1hk$^$RS=I-<3!^cV6ksYrw1&vZcyK&Ker&9L2B=tZM%d
zWqq99a^<_4JQB!Cdfm0PavL!>Fr~<rvXl)sTnW^<7VMKbT^BN8!~lK(e`>etYJD#n
zO!{c_ZDt7i@ltB0R-;fbtT-1T5O{ujSX_(pp}dGY6}shL@+*!??Z5qW1vt(y*4K5(
z6jJ2Ntwl_g)FuSTwB?Novixz^7NNQxRc|}c-j0@7G7jTUWVTroNhAd`UpH<JEV`~T
zTyFpd)9+yL0#^W}k195Ck2O8n)dW)90xJjG<E<R(80dffk(lmr(mGaks21OmYUR(X
zcyd>5tRr}d>a5Xyhz$wvv6+`XPi4dfxKrAM1>!C5{qXqXEQwY$6!$>cvM-|$lKNlx
z`WS*=a#sAtO$tp;c8T_=4;=M{BmhAf0l!Logz}@v2Q$h7(3RwFa&>aIiX+xz$$qby
z+)t81ZZnU!%-!Lq5#_D)+x#Q=!y#&=x}YdG{cJ~piUohKvaAiqv!?J?93wt(iLMWO
zE8lswq=28_Y!T_M#MMMhfd+yLu3~sVYffnN`VdF&&RPE;-q`%yWI2PV7!0!wyRo>d
zc+BNr%PFLxS!sXA<myv2yYoh)WH_+d{{S`?t~tz&J4Tv=&d|(xjXO5Kw88ylD{^zE
zEjJ?H=q49ubV4;K#$3>|+01q#FuOJ5x?y%U9=`w%8{mLmrex-;IzBR3>BuF1`e)^i
zLv1jQx#s8eOBSsXL<5S*ui|q;&<wsN!s|C%R1oW~mX;Q7=B&B_#UHwPhM1?xR&Ms}
zKLrI#HiZ&yksdw}FCU9d+-6aelHpSR?iQ)q`xABEpY}^lwTwV^d&9yD_xRB|<1-+A
zpnLhQ^pDr7?c;Y}o3KAfTL!jvlQ^5l>|RRjm=JcvmU}#Sp@!Lh2{)I)h|lEZ)4$OW
ztVo;$ha-8B{b?WW7IzKg3y>g*FHhOJhkq>bt98~Bb*}w<C~$-WtMX5-<>H%nrghCY
zT&jB~K)=RP#t2WgvfH-`;YuEiHadB^c;H*1GAJHI?_~D1w2%Aj;$-VGVB&X~#@2;w
z>@R%P=kR1(Cu`)P&7|qk_H}Y^Ui4lR8oy#02?5m%bDzm;X@T0DCEdZ1oH<Ogd&TQk
z3vsGH`+duQHm$L2aRtS8-g_V!)G5%3!}2!m@>l-UBx2F0-H2hwi7UPclw#2(#LeLO
zvMpdIylA?8yF*>z3I|r<oZQHkH=k^u74Ai6Si3_crt`whGVkyK39NU`AY;E56A@rq
zQ*r16I*{PGz|n&zl*Loh{3+wu<+t!DcZjnY<GQ^P_Pg_wav61n4|!V`$>^!~`lad6
zq|89&N@3&SuCmqxkY614#p9vv3F$QQ?Ovyj8`T4*DdL|Z8^nR~4|M=GeEQ0-JhPQ-
zhT0O-*hRi)oe-TiCi0xOM;oVfIWOpS(C8IqS{>tl8|M~Z|MYy9hlgjeT>do8-PEq7
zGIzv)f&oBzG5U6Op(_48vW$3x!+!Z$zRfDZ3@gXCd*?g|J+HJqlEHM12zk|mlfFQv
zoK#(@G;Lc;QO_%y-YTIzD_@1z<EHf8_@y~ffrBmYGoMI0+~#JtWeMxb-$v_duJtz>
z!XiK-Le--n*GNBES=s%Jhi3s3KMMK=b7@msa!aZ!rXu*bf?oVghJ0X_c+;uC$MwOw
zgr@V#)v^D|#p$QhhgY^a-2y?O!w0>DDUD9F{ntmbVX@x5Ou`I(iqm|srD)@op`I)%
zbYxWz0W}OKE?s_Cn}B+Gu`)n){3<_0Uk-LzPxW=v&!3O-P&QDDZ`O(J9PPWhGwnRE
zx0=G?hVgpo)3LhKz*@BWyJ~yS(y-^#UV28BvCT;ukLsfXQ_1{iGs5WhLosa72^@(f
zN#apxAHHi>MwG-B9`t<odj`b*!h7YWWGA}x^XtL(4+{qE!)3WP>m}A4DuIr*B4Uf)
zl>9gHt4m0_Hiz$@NJ74P)X~{&jOp=CbnIOeQAeRLl-Y}o`{*ph(O~~%GhZQf83?22
zV>1r&c|h-)^Jup(ru6a*mSa{AruZbTXeXDNLMD^Fje?guvTeKdG;?ws^_!E-q4#!!
zU!B+l9CM-aqFOI(I4-dF8*R6<L<L7c9dC4gn!wKVD$CM5@>Hfz)8|0*Tu3#TlG+!C
zxgE_z73WqzxC1}S^Dn9MNiKU!5#2Dbv=ydC`?Hxw_pvws$yY#J`DWt&{rJ{wy!n};
zeQ7?lH#JX=jhI2-#~8!Kk$X(teJ=s#(?1|0qX^+<Sl3!aed)XXWWrVQI2vCZiMgsi
z)67S^i?n{K*$Z4Xt8N7!U(^%6Z1tcKSp(){i1#8bsCojrOsHa8QVv~AQ^SCgg>Sp{
z+8@2k6`5NxnC<V!<1o-k3LKQ!`yng<zs+4lYIN<elr%W~ps8v4hFyl&Q`uLh_aL6G
zvo-d^iLj8AsT0DMbo1rnei&hTGmV}VdN2M7&*x;Xui#2zrbQu}2$Z0CON_5jsr|Q4
z6OF7d-i*p1c-Eq1OE_t(dTrtOeB`&(n6*!fQBhI0&*9<wgtnBh_o0rdQ$c3C${%NI
z9pO{3Wg5v$DEkOsQ-Fj~#V>_RA|2><lx-1;lh3+0b@O3mj*Cok%6pNcqf!nlw1!?9
zc~vDdv&&HurWTql>cyt?gN%swRn8eMzY{f{GILHU^6+g*HV<HYOKvY{-00X;(Y4W%
zo%Gq9#O-y)+rFzM*V$7tCf2KKWV-%!v3zur;o`iEtwG;PjNPVDz!o9Ar~X2EJHo1d
z&@btkS5kU4w+RRCXM93cwa3GQ{)Y90w@o~`X!2+=8n&8T6*Urn@arRc9TX&wm^i<!
zI{dU}XTrJHj3rU-{XWkuQvXpRJ97xLWK&Qh`Dou)5pm3GlA!t21ec8C-BvGzCewZZ
z>bu0}OWb2OB%7ZXtdU*v1im?9bMvSsw<MabmNEB($}1jPPPfSX->gRlX3yyG$I{_Q
zL5t@aB(GDG=PfhS)+~Q&jBW0|8xxhN5H#+PpryLpPWK->{fG~h#(euz(wnh}ubII4
zdqm?606I66je_f<09R%sXMR_9)aD~k)Y$OuD>k`O;@ux+c)<A9j*3$F5H?cG$%z1F
z*_37;ql`F9KgBW&b7gP09_4XSahd$ujCqQf2wIpPyTpMt7$&!hn$BnH6_MA}js32D
z9&N6#g+8)hdLPy*tVr#&Sa~nyu<M0PZ<{pzUI89Mp(3j%UQ59z=WU6vpq=_TiYeEk
zg1UK6YhMPV>0c39&*6F<6ZQ&IcMHcTt2S72V*J{|ceVzcfa|ud-Fn7t8_S*-ON$@y
z;*eV75BkslaI5%vh24yiLSAxSWsMA!SR}bEIJnUFi+N}J3Kczf>aScOQ2BFtZs!+M
z@G&lQFEezydnF)UC}ne%og>>dv>>bO?a2lVhut8PUB(mQ9+<cCi?&DC@m7G&hV+S-
zs1GmQ<1N+zI@eXIwu;zu$#s`_PI1l0K=wP2evgVZ9z&-pBA=eEm$iL~758Q!t<t1_
zN34kPC}6lfsMQZJKPL~>Xkb@+I(&kYQ57rw_0e!Q)`|RfTUeWaUKSVo5QpXE&UO~W
zS(;G}B#q{mT8bE-ZtR)@$B6wrL*1x3%q&jBB@Hevw+w#gMo^RHvnA?AkEKG+RAu(q
z<Tlwk`s*u)6J0hXE>j*}uKp+^!K;=Sz<djGY!5HP9}beRo=|v03SFvQV7O?Df9^&9
z`H5*IU(-u+^jI&q7}l#^-hlZ26ftuooOW!e%|`Ez-951Z2rPAL2vvS_^{yJerR{{z
zPEghTMD48ZiZMI&M&fe8m3$2gB6cz*-%dp_`EjrCNu!#YVf1gd974Xf-J+r2U-0wu
zJNZXkw#Ggz91RJ6OyC@}LL2dYF~>0V*HcsHTUvh!eh+z}Uu9(+Zn8oL*#%H{qqm`^
zy=frY$}wA~w=<3nr#@UWcBD%k+o4%Z0k^s4SLZ(TobOPl+$%>WRCWSV81V<qIik?{
zWO|TQ@t~cg9T>FN?kM|x@X};1G7JbUs3`D-v<jpTHPRT8RXE6{y5=bbIN^GZZg92H
zS{dv!`G;QrG(tw0UPT7Z9h)q7p2=v>L(iUJmgB#?B(fqwA3eKzA<*cD)BjbATz4}b
z$=mEcHR&q2aaLQt3{rrwtF-5+bGWHOExw5ulUCIfnQztQX||74Oet`e_e^-Dva;qK
z!D&=l11WVp5ADLHGu{$+YJE|I3EU10`6ld`^Z>{Jv2zJe5lSgGF<3o=vvQ52gbgb$
zeg_$INJ)c|e%@#VD?IBZg6_aD(XP+nkgwn5s@jE5IR_AvCeV>M_M*{GqbjK&)y`{9
z`mRCOfFCt!HFF~7j>7V<jqKL<KTaI3&Ti9Np$nPgr=6Ma8R0MJ>~p^%@rOf|C`P2(
z>7Zbxsmq?TSSR5uE>hBAi}EgxXrYDTp6^luk4f>9PcNo8)(S$JGOfzhY$3L>Q(0{_
zv4$nk${0Q&2SW;T*PYIn<?_pZcWcQ&2ic8l5dbIahG$fWNMqlrDw(!2&SgL-Dp4zU
zDH4gV*~a{vUmC0Oay65|w*>s=1Yd4x@4)a86@#%s&WF<{nL-;kGsp2e!7gI0rkSJB
zTv;Qvj9<r)4NfqY)N*(%mnuy=92pfctdZv@>`}KboC8KQ>}Ns0Ffg=0XG+D?8N~0Q
z+5J|TCw}eXa<rv@b~9A|m?6EL+nx+6_%F0eUfC3=JTV%nor?Z}@Y0%we&_;hC_R%l
zC*FAB+QJ&-qDlPBJ8N<K>#9ls91WJjYcO>&=YP8Jo>QB_e0mz;zPn}-k@_$v&*3K-
z@KJ^(xI6oPWfPdol<jPNa|9#^ZSac$9NE9BaZe|>gt!byBU((;ymqCcEfh+M<+XnV
z?!Il!%8jF71p->uf9Dz>Cxz{Ki7&@sZr<RB<xa(y`7+Kp4b(E9uP3sgoM;%RsPy^o
zGqi5Pf&xd_7~%By%`{Dm<`wEUCNZT=*MT`_ew~2IZ?g)iwKhUX;T2<<nip$}u0OQ|
z0-9qLLRm8~*pk8$0$XB9#OR-WiCBeMzx(b|Eg~s-d07)RM+H=I<`VS^-;aXiMpcmk
z9}jc9)@D01H0_-iWaJIkgLG30`iPwu5eC4d`Atvb)gpKTzHoS;LpseXeL*6U^l$B5
z;hu)2MCLR8t{l~J_crX*ej1t-rE{ErIHxC6R(7TRRNfVM+l~w@TVZ>Me!MAC*+~ZE
z39wN~?J=FXDKE(9-;YXD?qm_n`aF5C^YZjHni_w$Hda0!>f1YRVWAUYSS1Iv>PUbv
z?AG-g9v$_L^*Z=ngp#*ZtNPjyo}Z?^e+msdFLkKV7irYkzIxY2AGe@<9y4^vz2b>K
zyo`Ddr@T91Uncuc?dE8dfRO7@h=`;Itz51bYmS4_VI-n?nfy18SCuCNv%UoG)p6Ka
z0<wgaQ7IRF9;+CEU54~;vxu~tU89ti0}Yi~qr^u@OHbxi@UyMDmG6sd*#Fo&Xm*`>
zmpB>B{0p{^518Hci*<{%uczWa3Wd&I8%1VM@4INJh>1MUs3B9=S>+Q@xy=%mdJN;e
zZJmnLE2T?N$$d;aG$uzSbu@S})~zH3d58VVuQGxYhuG$FzQE<6`aMOQA<)4Vretgi
zshR5PlfiUh(m73Y_fMSQYGZh6_gxR`X7Xgu_RmMYu}=pZrdq9OrCbD>KNZcRJze@d
zfUL!I%VR4N2+)Vi^Q-N3NUa8bG~0EskFGu6&C?wpdM{tl@=do@U4XYxGN*W@mfd}G
zuedu;21wD5@7Y!PM0K7yWzHeh%jSH)=0-0SQ$iR9n=T?zO;xRn9b7{f>h&ej2qEIY
zJr|quNBKxqrKjh9-Q&0Lq49b4+Ti#y5TVTn!~s*e<<EiGNxL|B&)LPnUP0UWT1IbK
z+K#&p88Gh+-jNLE9&QGQS?>Pe4(u!q_+ikNcjQ;zctu4KM7I=d`cdr)Nlkk5GbCtJ
z?KA_;5qk$Q8{9oKdU%0B3f(*`o0g?uqB0^&N)ohXSy0*Iu6@f2{%9vR#RFTa`s|pn
z&B4`oH?-WTBGv9m=bFVYyoo3M{`<c=>M9Af0MLg;mklbQ?H8G;wT4p>D`_nmzoN_P
zHXFyMqg~jIM*RP9Wh6$C0s@|swNV#-u{PAyCaTDw^{X0?m+>&03==!$Xnua`Wa7TI
z!UzY;w{`{cNtiGduiT3Ug{Bqryz`trHlBXXn2YES&T~MI$rCAXqc7*R*AJc7L~ej)
z=2cE|sp?Mq(3p5S1(k2YZUZD7Z#8ZGN!XdGmOc#%*{6a;lYA}Ke&qFE^z`;pL7(%4
zmVawceXD<kuqG91NYvHmI8!Gv(!2b2Kvz<Haj#Z?16dYX4s_nC9!|YajB2XUdHive
zSKb`|<W-3tWI~k)c!7Db`UR(unR#iK)8L1d|A}B}7u;|wz?MqV1mINg@^0Ig-f}vs
z%kJT>uCC=)4H-;dthf!FUf$Tjt2=tOa8klDe{!QXIyhnS$rE5}awze8yX9(5`a@G_
z)m%-o9{X<BaBu=pIHD+>*)^|H$KX2h>|DCYpf5(O#Ce7_Mm96`h!Qa;;5mBw6>gCy
zY>PD<ZYxEmbTtuaeJw9Y{~7epSHZh3=?3+4sl}V*Vi9s*g6Y@0uUwtk2RJ;>y;BZm
zY!<vRE%fNU(QbKx&cB(~YWGG5;(NY4dW%PxpXZLa$vhaGeGyeo!}8EKVrY9a0hm`0
zY@+Ainy|{G_qE--&?r=Oe}Ru4BOc3zlL2Gi(D3U#gU)rjtn^;7f16RLDSUoP;WuM2
zts-N`kcG$IG&WVSt>)*2>_rX94`jDf06xc{Yc8rLN3y6HQUX}QmsgS*lK73poBhcL
zxw3jyZj4H4JD)t|Gj04y%3#7{+5Lg;3dtXe;!q^+m%?y_+PCYv&+lZq!hg4<wQt_$
zmp4imcZ4K_x5-qOZ3eS9)ik`n`f;bH?f$0P?9+v*_1H4Jjpbfi!^vV(7tS#85yZLK
z(ttA%`gC;3sJlvNtBr3uOX5bvt7hvPlhx9?WZOFOav-49=>dA|ZdvTn8%!Uy8{z70
zM@xXg^>Df917kB3AU9%NOMuqdA_|kX`-LpaYeX-l3%S_B@i1G=B%r?5s^e^FnJcpl
zbxucnRYn5+Sv+i<Zhq6ryL$brOjHJORM?MSO<wn4rp;%6W2``h$ULsRDZDV+7MoT0
z_^r^&yUNH-ugp@rv%NT6Z^ULUG3_E`#+%x-i8JF93#;Bj*G%}pe)~PRSj-bvcZ{E^
z8lXAyn{^D(G^1kJmV-d~V(!CLo-ZYHn7ZRM1?c*wbEGk(Zs-fOX{rkdS#_TPAvbW6
z@os;E8SLB|=*IBK-?U&u?Xo;ik?nbI=bB{BUE-#-S7=JxK!*O&B{SzA>eI$~Y0!@}
z;e8aTGji-rR6T>^;NB9c+AHEQ`>{I3<#%L>^o*bD?cRkDGh|I`Qn75qY#VRW3j|#k
zuTY-QbCSRL^3#9k%fp1HOA1*Ew~mU*DdxkE$r#z-9Uoo50rfSME~|2)0v|wqMNxse
zZ&(D1;XGjnc=#hpNBtHlr%SgRyx+?+A0UA8Vo3Hx6MMs&ui$L3lv3k9PxseWH^|Bu
zLwA5!DaE^x|D}!;Z4CV`qazwR>7Qk}Psr)CU+4a)VtKQBd@Yrych_fO_mHpY5yMi6
zSfKq=KFZrJ-qd}cEKzc`lFlW1=GH2ev+aD%H=*;>I-+b|h%jP=io3}D-E2O$xuOub
zZ_`Vxy2f66`-cRGufkrm$VB9IYPLoTEghLi#~*SE;A~&+V3RDBAhvT7I00eK-|~)*
zXjuEaTdHVZUiMaGE_$)uplRY4Ydud}rV)|8Ge4t@{Syzg%7B`r=hi#lg?I)@v)MLA
zG9Wse&jzQ{HZ~R12v{+zwi*0U>bz@CWqpQ}hsaIEsPl#zyCuGBvr>TtsjE>F039Ya
z*_cKqcK5%oc)&j1(oI$6ApO<{%`990)+aFt7xFqCySL`6jU@GZH%^Kk9v()l^3UNZ
zkEU!1Itvm$PBe0@EY@4ht&8wLopY$+C+mb{n~z%&aeI!B)vmVaZ)bbgw-Afg69J<7
z%Hglzn{sFDO<~SQ_U2?sx{>r*EOTBQw~_R60hDTR_WsFnjA26d%>M9`DJ3&|qh{Wb
z9%Vf<w=_lheo-i31z7t%XZK9EEoCo{fXZ~5fO<Y1FTPc(;j74;ox8;*5sdxoQTp$_
zne|CN;0lFWBffgIZWB&n!>>H%nK}@O#RrI`>~X*&&eyEYv#Yq|vX8Syyx@mZ0F*?v
z<GHbQNlmqz=<}F5f<MHB*l*gFgW`{i@uKr`<kt7iF%k7{g_rjkpkWaiYtPr@J_;V8
z{bubRS7%!j6ORwAN1L7f*y62@3r~$PQI%5K*e+Al_SGCEM9{$M4YmEFEs?^4-ZN<v
z3W1*W;w0$D8~l&K&*86f3^l*JhL*<(0k3rDa*P1ci^V;2;E5?U0VW0FHyO~HhJE+j
zm+h#&@Rl9`hH|Mdkq1iLf3>OqJ&luCx$kcIjc=#hwH)z&SR94zYWgD5c8MH%+J$@Z
zjo&?FpKwIbjJnhIQ~DETF874^_)|k|*Wu>-Hy>oMuIBSy+WgCV&EwYo=&rNcKUa|V
zA{xxR6NVSn8=!Kcqk<I&y_fW>z_Uod4zH1LtKMvk3do2u>DY=$xk;JhHEWv!)V!yW
zj%lT};iN0-F{?|%8_YLq;rmW+Fb~?RxVM;hcXIPeIPCc0R$hC*^il|xJfYkO$2?9a
zhi<{-i%zQ9;CmXa3z<5aqXC^HbuX}ppq<{N6%__xB}`n-)cdTHtdnKlvFE`XOzc4w
z8}vC8?4yb;636$d`xFj}!C?p3ZWeDFJ?A%WFVM82-;QI-(UDYXDSYzjO@}brdyQT+
zFKmuV2@=WdicVi}6>qlMAhzyZ7!?lHxL5bzfyP4#lkGaScdArdjwmQ5q62vnp5dF1
z{9#A(zHD9i)49OMC6|EiP(1G|BY*9Uq&5Gg_>9-|taB*&+qobmNXyeq;$lH&%xVht
z8MQ!|i9~_d)e|mWU*-7L)Fu~Htt`jI;@~{6`g;~YdbbWG8kaR(Z*&AbEdNM>v<+D~
zK=Op+NsbmAzGv(H$i8<8YThxbxT6xBIJ&wsx_j}Ogqy1MK>?FhAKJC&8sKv2(YNJd
z|EzNj{fHQS#JwN9$-jHDHFcIXlXF}1P^xy%v&gbTfq0<;ly~if7!434F7xJK;J<JH
zRnu|&sg&c`!<@GflYwsHQD@<+7qLl+?9Q`nDb?L3n%Z1&+h-dr3JgY~Z#Awg0-jfj
zS$Li`R!DNYiQp2LpT`o!iP3?MZu8IA!$|HhU5J@Z5-`-$-kjR4P8f(&_?_pB=$F(@
zC3G&E`*yx~tBCD$ZNmKJm47Cm|0$<Pg2b?jnP5)A+2>&0d3}G#xAj9&MtHtrCg2{L
z52gO)<yu)y`BR<CenFY3(WeWmdhkI`r}s;or3U+77GLa?41>?l(Z5;NXMbW|RJR0E
zUV6vdJVz})pAU$5qp95*;p%yamiw4cn(;;}wHm^Izq8<OVzMD4TyJ#TRb>U3t2Fg+
zPms1j+pE$+kBFhoQ^s!!#G)M-Q<nS5&~bx2HzB$$G?F2mc!jFylIT9O#7F71Fxzya
zU%&WT{}B2Ws80iLnL9H|?sA4|;J;+A#`^k~qNS7`|A17j7MGG)2UbG!!sO0g=SztF
z0Jal{!Vur~C4C|+;sE#ESyk@mnB=5S;*V|JoZB!hQ1tj}TbUHG#$zjOF9lLAlmdB}
z$1fdsT~=;M<~-Z2t8!x^1AZ9d)uQaQy_10_Ck&lK2}vHfjRh6!Y!qfpAAf1MuQeRh
zUb$e16XsaVq4ZUe#~uJ^tFdS_X#25OA*8^&mv4#Q^EJh`dB?nFv_`!5%Nrj~q>FC1
z2a5#?lV7%|pOOKya=!K5M^{IG;Sp25Jl$!rQJB9la$c%n)%!I4x(<d^L;8i_b84=y
zm56Gk6{-@2lyeF<5I%h(-Y9gmHKRPea7;Q`y?xR~TO~u9l(F9Ia}iF*=l4l6@FsEy
zTaW%bysoZpd)+Ci3sL2{sj*FG@0{$T^lQJ`5k1j!WLt^AA18^f(IvyutzwnicXWos
z7}_w?K_ew8B}pF2q;VUoGCKQ$0O}{m8U{l1@FDp(7)Wpx8*M0xEwN|&wJB{)$)#Gq
zMd0v_L}jWLZ1byG-BdIqPear>q~cZ3yKINjzK_^4Gi8X1&*P+-EAK3GhqhvP4WDoi
z4A~YL(l$3(^$s^2*9ee@eh>T3KyrCLrgZ-*V*hCnSWb@s@q{97PBYuZ%W+R(bE#RH
zGv>^Xxi(@k(6_#@`wCWT11#NK?HwwyGk?c=gNTu~EUNM8$a`aZTOoNXk@+t2hj){v
z#3wEZZM!=5#6$I$RY|>6Pl=S3wG2HZ#cNMSsJzQD?>8se?O;by4Ix!>1b<VH@HC}2
z{n;B=(c)E#7Ly;=m&s&-s}mJ8M=p9Q$Pa^N60xD&@9+5DC%E4RXq0mBF7uA)1qbrd
z4WuUxnb_*2vkQC_LFL;?y~(0lPh`sCYYrS&EYRy*dXjKI>u3cx<@A(o;cWZx%#Q;1
zV!0tiCA>_$#xLt#*}H#V^#0=X^=GQN@W}vWuNeyV;K$Ui(j$R4c56>b8I_IAF<A}K
zZKOJP;OTKU6{B}zMmb^`=&;?mXvBvn1B(V+{zH#ZC??S(NiO{k)bYR;iK}b7lCiaB
zfQdA+aYx)i@1f_mc;7hW`Yd4o+RuJyJJih2=2*mI^#SR6f&TFED&HF%Llq_*^wAYY
zlO|l~!TE9q5?Hdv0IX1@5)|Ld92Yn&<-o5Vx(05ap)NnEiu+P_>bpnW4MiRK=hc*q
z)%1*}d~YkZBwb&(4nA9lwO$ui-n%16-ipv!(N_mH!V2Sm<;j)4?O8)>;bEhxTe14n
z$#0HpQ#7Y$kKP`YI-Eq2ppYRn#Dx1$cntYX+UfqO9BO#)m{V$vDtzD9hx%`y^b_&Y
z(bNNK;i6S9&kauf8CUQ@bKv1*A@>xqf*_FFYN;M^D3o#k%|B`J1$!upD7we#wI?z*
zbGqK)NXV2cb=owtXH#yM_tpE2fqoxGm-FF?2&i^5hYVq-EkUY}4FN(}CXceYb?;!k
zzf`(dLYX*o5-}n$OY^%v6vuo-BKf1Y$M}uh^=Y=~X@OK888D<>wps=wOGv}9RAWE(
ztGm|qwz({@tJJ5>mdp%qXei7zu&0sp+Iz5xNkCv?!7EW8b_adrwj}+x?W<F|K1*yI
zcfmT)-^LY+`o7;^A&PCz1Z2W}Zu);pE>Y3amayD6ADP7ZX@zSvAGVjvy<g^KBxtl~
z^V@}1Cs@KnpqO3e&Q;-TCm+)6%hpTtJcn4K^pPv@depQ0=WzPnHLhB#+|;^8$NIKq
z8GP^uHey`Sq{Pe7k(0-^+qW)tga}6LuTd1myZxwPJ}tp~o9|7;mf<dW!f*jK3WX0u
zib0l=g@!}($6~h_r*+qY_-{fZvIGc1yBBiUHtex#($~z1JHYr>f0woQu#o+D)V+2h
zgRcB(6MViQx+W%XDTL?R5FOvY%M2vfE>VrG9IS1f!8%kb&09W54W65^svJC7*kB3x
zbhIR?2UL8xn&w9SHzX@QB0vyGc!HDVYiR{C77NdUhn{<h6%|JVxqB<6la}8Rdgo^e
z`=UC){u)_g^;6b)*adZ@bB0F@afnoUm@RAyGMqX<5b1+=i_cfs%c%zr*#>Q4ES}mP
z*>T24%F?0Naam$e%C05e`4<ET3u{X}M!4nGK+5X8e|hQLx3%%``ql-u26-kq&}%LR
zn?Rd)u&QUya@wHG;vQ2~RhY;PQvbA(Yaq{#qv(!v&^}>1pAJQ*ZFq)Hy7cbpdSOOA
zNvy-svNI^7){dNPW2Xc&{KCR8bd|!j=9uzzYn6_B@qwYz5Q$O*DTgp}rS^M)2B*-u
zS@~;q0z?Ep71k}<V~U3KT3{zXa3)G%_51QtoSnrHplUqKenSVv<Miayg{Z)xk28Dv
zfA(PAc2dt37HOKUqRa<nrM^bXy5uvMDwkzsq$WdOGVyrnY<{S@r_j?F8X79gX8H0;
zx7&@n^eq|i!5!?;#SLsg{IcaC`~Z8*5&fMS2bb)9JWi-a6IaA{?72rWU@Y!`nEqpe
e|L?uvmb3v9g!1bNPyc%=T}e(|woLkM@c#iLzn!}P

diff --git a/src/es/hentaila/res/mipmap-mdpi/ic_launcher.png b/src/es/hentaila/res/mipmap-mdpi/ic_launcher.png
index be66e4e24670941f8b8c065ece038b644aec9991..9f10683f78a2caeb1332b22117d9f8a4ef8686a0 100644
GIT binary patch
literal 1197
zcmV;e1XBBnP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000DZNkl<ZcwX(9
z`A^h96vzF8gjK;SAx8a4qcQ$sG#>GYN8*)eqS4<}Km?*98n1W|6i_iLUf{i=;)z@;
zQ52(qE{KAl%dvyc_n7WZc|BHaH@hT!lP_J`H#6@uold9ih!MjYmizLJPM+l(mFz|P
z(GX=*4qnQM=V>aRXGfYzC9z@5jpsW+TF)B`#**#Mgij6|W1-lxm**XlFE++}IQx0t
zA@Sg5bW4;?Iq<xA-XZCOzIl?N-ID^H@zL{7^mojGL-4#q()auiEZ7~F3L<VNh>_^!
zc_1npK-4sWsQn7!4Z7ARf3H6;W6T_nUR40%Y&i&Tovh>47Z6WAg1A)+;$SI=*+-4#
z(7o6`LHrj$8v;-TfED$-_zl1xFgF6g$TSt({~JC15I}X4G2USObL5e(yfk%Q2LjMg
zat`pW1uR90a)7D(0h&8_q`kIYi4Z_S27u_}%}M!t0phhD*Z1JH*E}-38rvfTFh7Sk
zrBw4p^?Godm<iA;cw~6daGJO$0sxyX@urk6R1NHT0+@4xNBz4NpNas$$tS!SrHtFU
z-q!$VEL(|&N!ES7S1I*I1OQ6k^JbJ*6fgkvaU0;0T7YHwe6LbrMFarsW|Jw|#xqb_
z&!d#~mjX=6=6jWB+I1BmX)kX=sm-sF)&qRC0bZ-!Gg^Q1BT}JR%`JeXr+E`f&pzoA
z*OH%T15BEERK}J!@FPky4!a1jt(aG@l=s5e`-^OVJG!-abbdKMs<h#PivV;{S!sK*
z5nx9Nk5Z~=RPiY{`B9}q4_ySPusPKWb9KpU00lNZTUe<87Uc4yN_XG61b{0^X!rB#
zrRc6XVYluKXhY-qXCA4v^QMX)hh_Vy5)(DHxdbp}A3(rj4b=2gm$+`*-o+!8mgH%%
zTKvcFJVHwA9OnQl^Q{5s=EjE)tw8ORl%)ek->c&hN{ez`0N8%r8i1A;`~qHihDRy2
zbTVM{fd@QFDW${(fD>ib09!5_0W$CKD5XdBEFQh_B9Br!_tFJ`t2NdD^Ky&;muh&F
zQqEH&!1TjBN~yBZ1%R>-)&Sc|<V-?K4I0}?c)`E5d1}kNiw{QloG^a3T=RQ&q0<4n
z0z6XcS5N=*v@?Lm_0|ARbzZwCSV7}+vY2+zAwW@8<N!7oNdN*d69KF%bO?}K92tNQ
ztpH=v<#mvHiyxIDfUJ8C0TQs0I*U{MzoJ(ttIw(nnQm@oB7mZ5hXAw|nw%{k+}#k}
zVX;>S%tThpZvv=na1QW?8i~WPy5<~ClhpwAc>23>=IHH{Ynh<wwM&nXZzDQ!+1!jb
zu1`PYy8jAJugA&&=AImwd~o{x+@`B1=spndTcE>}I(Pswy;|%-fPk5CdJA~cAdr|2
zfw377NI;L;CHIqgd^nH6vg0zPaoG0%pO^tXxTW{A)S-h0AZmi33Zi8i1+5-AA_fgW
zrh?Hn&nX<hkpIBpH7O8l_VT<#8uB0cNJIKFYfwY_L-(+TH8}kRJHQv{nx$r100000
LNkvXXu0mjf>xD7;

literal 11997
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

diff --git a/src/es/hentaila/res/mipmap-xhdpi/ic_launcher.png b/src/es/hentaila/res/mipmap-xhdpi/ic_launcher.png
index be66e4e24670941f8b8c065ece038b644aec9991..61092984387fb49b4c502a3921b41ad7bb2fc6fc 100644
GIT binary patch
literal 2815
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
R2GRfk002ovPDHLkV1n6+FIE5m

literal 11997
zcmeHt_ghn6voEMf6G22kkfMl44ZRbj_fF_VO6Z+HAcP{lqew>xf>Nb-LYJbn(0ehU
z^j<^1@q6BL?tAXPaNi&He)g<A^O?0~&7Rpa&x+DiS0EvxA;Q7IAyHD4)yBcW1!6B6
zg8SH!NIWqz9Gp9>_PPcT12t7qD_3VO3u{+PFqe<B8}>a8j<}?cn}wAl7{X`?wzYSW
zVA(^qu`t?OOR(q*sBx>g$$;(b6=5D=9hkbV70l5}#F|ACNF?qfiUn{6Lo675oSj@e
zMSUb#{=pT+KK~sCurU6^0&$dJk@~BUQO?KB1MKO^f))0#wh`5qmH(G0mXctxgFxIw
z0RSiz$_3@)a`mtU@Q8?r0JwPpyu6%P4o**B7l?%qr;8^O7J=~}2wAYFm503>#NO3~
z@h_x>rK=Z2f`x^M@n6W+R{sO+=H=n^53IEn0PF;I2D?B!0X$qhfd9*lU690!f6c?i
z^IvAd8VulL;f7`92D~6*#HwZ#x3&_s@&H>vTs{7h|1}pKu=_v6e^E~MKoK4hZaxt{
zK^}fVetsc7alqdhV#oiH_=otHh&bSX<B4PEAu97<_`0sHPQd?VK1O~nZZ2+4Yp^%i
z$<>XEPk=`p@c#;6&GV0ff3pwP=>H61t^W7%e|8T`{LlV_U9g+(f!*B@%!(-v4kM0|
ztdy>g*-jSzTaesj?^<i>A~6|^L_impH8<x4yEZ5qa?h0FNtfB==|(i(6ZXO&2wAe+
z1_2SJ=9i*S8b%7%=U);}6VG;`tFJnOlonf{E@slJl1Pr3=5#*K0KPL+vlyQ(Mfklt
zj5v1^A8EckqS_6{Aqc_=*|#7I!XZ#p!0BW$P5o{`hJ#DM(1U#w1i8luAN3M>b|054
zXy4+&f0+Jbg8zTLKtC|m(SN$t-w)s&?t6JraPM5W<?b_efY@zI>fmbCA7S0q-ZT|Z
zGRMVA>BVb7Ijtj8)aP3aZ(#T5)!TU9!=$Xz>p!{8v!nqc9JfN}O8s(e!+ra=-vdtp
zHRn*Ev3gL(PU<J~kK{SCRn@gH(|`b?e#?O=fX;!{jc&qLRi&MdlY@ic%n=K6MzC~X
z$$6-rfg;USMI{|C5dZh>&H$si0FrHHaD4M<B48+YHF0DcE@|4Dp1L`RGXACdxf)NH
zXlwPx4)40k&;eJb{27v6@u!~Wjv1F<er`VIa#lLaw+>=n5O<0G&g;2d)M{8D?dh?y
zynN_Wd%U(+cN<46=^Kd?ijv7GFYIC4Ro<Dc^)DD-pWMx8pREU-oVdQ#*{L;&E+Nv{
z@Lf^TT9?u}m&qUXR6_xn1hk$^$RS=I-<3!^cV6ksYrw1&vZcyK&Ker&9L2B=tZM%d
zWqq99a^<_4JQB!Cdfm0PavL!>Fr~<rvXl)sTnW^<7VMKbT^BN8!~lK(e`>etYJD#n
zO!{c_ZDt7i@ltB0R-;fbtT-1T5O{ujSX_(pp}dGY6}shL@+*!??Z5qW1vt(y*4K5(
z6jJ2Ntwl_g)FuSTwB?Novixz^7NNQxRc|}c-j0@7G7jTUWVTroNhAd`UpH<JEV`~T
zTyFpd)9+yL0#^W}k195Ck2O8n)dW)90xJjG<E<R(80dffk(lmr(mGaks21OmYUR(X
zcyd>5tRr}d>a5Xyhz$wvv6+`XPi4dfxKrAM1>!C5{qXqXEQwY$6!$>cvM-|$lKNlx
z`WS*=a#sAtO$tp;c8T_=4;=M{BmhAf0l!Logz}@v2Q$h7(3RwFa&>aIiX+xz$$qby
z+)t81ZZnU!%-!Lq5#_D)+x#Q=!y#&=x}YdG{cJ~piUohKvaAiqv!?J?93wt(iLMWO
zE8lswq=28_Y!T_M#MMMhfd+yLu3~sVYffnN`VdF&&RPE;-q`%yWI2PV7!0!wyRo>d
zc+BNr%PFLxS!sXA<myv2yYoh)WH_+d{{S`?t~tz&J4Tv=&d|(xjXO5Kw88ylD{^zE
zEjJ?H=q49ubV4;K#$3>|+01q#FuOJ5x?y%U9=`w%8{mLmrex-;IzBR3>BuF1`e)^i
zLv1jQx#s8eOBSsXL<5S*ui|q;&<wsN!s|C%R1oW~mX;Q7=B&B_#UHwPhM1?xR&Ms}
zKLrI#HiZ&yksdw}FCU9d+-6aelHpSR?iQ)q`xABEpY}^lwTwV^d&9yD_xRB|<1-+A
zpnLhQ^pDr7?c;Y}o3KAfTL!jvlQ^5l>|RRjm=JcvmU}#Sp@!Lh2{)I)h|lEZ)4$OW
ztVo;$ha-8B{b?WW7IzKg3y>g*FHhOJhkq>bt98~Bb*}w<C~$-WtMX5-<>H%nrghCY
zT&jB~K)=RP#t2WgvfH-`;YuEiHadB^c;H*1GAJHI?_~D1w2%Aj;$-VGVB&X~#@2;w
z>@R%P=kR1(Cu`)P&7|qk_H}Y^Ui4lR8oy#02?5m%bDzm;X@T0DCEdZ1oH<Ogd&TQk
z3vsGH`+duQHm$L2aRtS8-g_V!)G5%3!}2!m@>l-UBx2F0-H2hwi7UPclw#2(#LeLO
zvMpdIylA?8yF*>z3I|r<oZQHkH=k^u74Ai6Si3_crt`whGVkyK39NU`AY;E56A@rq
zQ*r16I*{PGz|n&zl*Loh{3+wu<+t!DcZjnY<GQ^P_Pg_wav61n4|!V`$>^!~`lad6
zq|89&N@3&SuCmqxkY614#p9vv3F$QQ?Ovyj8`T4*DdL|Z8^nR~4|M=GeEQ0-JhPQ-
zhT0O-*hRi)oe-TiCi0xOM;oVfIWOpS(C8IqS{>tl8|M~Z|MYy9hlgjeT>do8-PEq7
zGIzv)f&oBzG5U6Op(_48vW$3x!+!Z$zRfDZ3@gXCd*?g|J+HJqlEHM12zk|mlfFQv
zoK#(@G;Lc;QO_%y-YTIzD_@1z<EHf8_@y~ffrBmYGoMI0+~#JtWeMxb-$v_duJtz>
z!XiK-Le--n*GNBES=s%Jhi3s3KMMK=b7@msa!aZ!rXu*bf?oVghJ0X_c+;uC$MwOw
zgr@V#)v^D|#p$QhhgY^a-2y?O!w0>DDUD9F{ntmbVX@x5Ou`I(iqm|srD)@op`I)%
zbYxWz0W}OKE?s_Cn}B+Gu`)n){3<_0Uk-LzPxW=v&!3O-P&QDDZ`O(J9PPWhGwnRE
zx0=G?hVgpo)3LhKz*@BWyJ~yS(y-^#UV28BvCT;ukLsfXQ_1{iGs5WhLosa72^@(f
zN#apxAHHi>MwG-B9`t<odj`b*!h7YWWGA}x^XtL(4+{qE!)3WP>m}A4DuIr*B4Uf)
zl>9gHt4m0_Hiz$@NJ74P)X~{&jOp=CbnIOeQAeRLl-Y}o`{*ph(O~~%GhZQf83?22
zV>1r&c|h-)^Jup(ru6a*mSa{AruZbTXeXDNLMD^Fje?guvTeKdG;?ws^_!E-q4#!!
zU!B+l9CM-aqFOI(I4-dF8*R6<L<L7c9dC4gn!wKVD$CM5@>Hfz)8|0*Tu3#TlG+!C
zxgE_z73WqzxC1}S^Dn9MNiKU!5#2Dbv=ydC`?Hxw_pvws$yY#J`DWt&{rJ{wy!n};
zeQ7?lH#JX=jhI2-#~8!Kk$X(teJ=s#(?1|0qX^+<Sl3!aed)XXWWrVQI2vCZiMgsi
z)67S^i?n{K*$Z4Xt8N7!U(^%6Z1tcKSp(){i1#8bsCojrOsHa8QVv~AQ^SCgg>Sp{
z+8@2k6`5NxnC<V!<1o-k3LKQ!`yng<zs+4lYIN<elr%W~ps8v4hFyl&Q`uLh_aL6G
zvo-d^iLj8AsT0DMbo1rnei&hTGmV}VdN2M7&*x;Xui#2zrbQu}2$Z0CON_5jsr|Q4
z6OF7d-i*p1c-Eq1OE_t(dTrtOeB`&(n6*!fQBhI0&*9<wgtnBh_o0rdQ$c3C${%NI
z9pO{3Wg5v$DEkOsQ-Fj~#V>_RA|2><lx-1;lh3+0b@O3mj*Cok%6pNcqf!nlw1!?9
zc~vDdv&&HurWTql>cyt?gN%swRn8eMzY{f{GILHU^6+g*HV<HYOKvY{-00X;(Y4W%
zo%Gq9#O-y)+rFzM*V$7tCf2KKWV-%!v3zur;o`iEtwG;PjNPVDz!o9Ar~X2EJHo1d
z&@btkS5kU4w+RRCXM93cwa3GQ{)Y90w@o~`X!2+=8n&8T6*Urn@arRc9TX&wm^i<!
zI{dU}XTrJHj3rU-{XWkuQvXpRJ97xLWK&Qh`Dou)5pm3GlA!t21ec8C-BvGzCewZZ
z>bu0}OWb2OB%7ZXtdU*v1im?9bMvSsw<MabmNEB($}1jPPPfSX->gRlX3yyG$I{_Q
zL5t@aB(GDG=PfhS)+~Q&jBW0|8xxhN5H#+PpryLpPWK->{fG~h#(euz(wnh}ubII4
zdqm?606I66je_f<09R%sXMR_9)aD~k)Y$OuD>k`O;@ux+c)<A9j*3$F5H?cG$%z1F
z*_37;ql`F9KgBW&b7gP09_4XSahd$ujCqQf2wIpPyTpMt7$&!hn$BnH6_MA}js32D
z9&N6#g+8)hdLPy*tVr#&Sa~nyu<M0PZ<{pzUI89Mp(3j%UQ59z=WU6vpq=_TiYeEk
zg1UK6YhMPV>0c39&*6F<6ZQ&IcMHcTt2S72V*J{|ceVzcfa|ud-Fn7t8_S*-ON$@y
z;*eV75BkslaI5%vh24yiLSAxSWsMA!SR}bEIJnUFi+N}J3Kczf>aScOQ2BFtZs!+M
z@G&lQFEezydnF)UC}ne%og>>dv>>bO?a2lVhut8PUB(mQ9+<cCi?&DC@m7G&hV+S-
zs1GmQ<1N+zI@eXIwu;zu$#s`_PI1l0K=wP2evgVZ9z&-pBA=eEm$iL~758Q!t<t1_
zN34kPC}6lfsMQZJKPL~>Xkb@+I(&kYQ57rw_0e!Q)`|RfTUeWaUKSVo5QpXE&UO~W
zS(;G}B#q{mT8bE-ZtR)@$B6wrL*1x3%q&jBB@Hevw+w#gMo^RHvnA?AkEKG+RAu(q
z<Tlwk`s*u)6J0hXE>j*}uKp+^!K;=Sz<djGY!5HP9}beRo=|v03SFvQV7O?Df9^&9
z`H5*IU(-u+^jI&q7}l#^-hlZ26ftuooOW!e%|`Ez-951Z2rPAL2vvS_^{yJerR{{z
zPEghTMD48ZiZMI&M&fe8m3$2gB6cz*-%dp_`EjrCNu!#YVf1gd974Xf-J+r2U-0wu
zJNZXkw#Ggz91RJ6OyC@}LL2dYF~>0V*HcsHTUvh!eh+z}Uu9(+Zn8oL*#%H{qqm`^
zy=frY$}wA~w=<3nr#@UWcBD%k+o4%Z0k^s4SLZ(TobOPl+$%>WRCWSV81V<qIik?{
zWO|TQ@t~cg9T>FN?kM|x@X};1G7JbUs3`D-v<jpTHPRT8RXE6{y5=bbIN^GZZg92H
zS{dv!`G;QrG(tw0UPT7Z9h)q7p2=v>L(iUJmgB#?B(fqwA3eKzA<*cD)BjbATz4}b
z$=mEcHR&q2aaLQt3{rrwtF-5+bGWHOExw5ulUCIfnQztQX||74Oet`e_e^-Dva;qK
z!D&=l11WVp5ADLHGu{$+YJE|I3EU10`6ld`^Z>{Jv2zJe5lSgGF<3o=vvQ52gbgb$
zeg_$INJ)c|e%@#VD?IBZg6_aD(XP+nkgwn5s@jE5IR_AvCeV>M_M*{GqbjK&)y`{9
z`mRCOfFCt!HFF~7j>7V<jqKL<KTaI3&Ti9Np$nPgr=6Ma8R0MJ>~p^%@rOf|C`P2(
z>7Zbxsmq?TSSR5uE>hBAi}EgxXrYDTp6^luk4f>9PcNo8)(S$JGOfzhY$3L>Q(0{_
zv4$nk${0Q&2SW;T*PYIn<?_pZcWcQ&2ic8l5dbIahG$fWNMqlrDw(!2&SgL-Dp4zU
zDH4gV*~a{vUmC0Oay65|w*>s=1Yd4x@4)a86@#%s&WF<{nL-;kGsp2e!7gI0rkSJB
zTv;Qvj9<r)4NfqY)N*(%mnuy=92pfctdZv@>`}KboC8KQ>}Ns0Ffg=0XG+D?8N~0Q
z+5J|TCw}eXa<rv@b~9A|m?6EL+nx+6_%F0eUfC3=JTV%nor?Z}@Y0%we&_;hC_R%l
zC*FAB+QJ&-qDlPBJ8N<K>#9ls91WJjYcO>&=YP8Jo>QB_e0mz;zPn}-k@_$v&*3K-
z@KJ^(xI6oPWfPdol<jPNa|9#^ZSac$9NE9BaZe|>gt!byBU((;ymqCcEfh+M<+XnV
z?!Il!%8jF71p->uf9Dz>Cxz{Ki7&@sZr<RB<xa(y`7+Kp4b(E9uP3sgoM;%RsPy^o
zGqi5Pf&xd_7~%By%`{Dm<`wEUCNZT=*MT`_ew~2IZ?g)iwKhUX;T2<<nip$}u0OQ|
z0-9qLLRm8~*pk8$0$XB9#OR-WiCBeMzx(b|Eg~s-d07)RM+H=I<`VS^-;aXiMpcmk
z9}jc9)@D01H0_-iWaJIkgLG30`iPwu5eC4d`Atvb)gpKTzHoS;LpseXeL*6U^l$B5
z;hu)2MCLR8t{l~J_crX*ej1t-rE{ErIHxC6R(7TRRNfVM+l~w@TVZ>Me!MAC*+~ZE
z39wN~?J=FXDKE(9-;YXD?qm_n`aF5C^YZjHni_w$Hda0!>f1YRVWAUYSS1Iv>PUbv
z?AG-g9v$_L^*Z=ngp#*ZtNPjyo}Z?^e+msdFLkKV7irYkzIxY2AGe@<9y4^vz2b>K
zyo`Ddr@T91Uncuc?dE8dfRO7@h=`;Itz51bYmS4_VI-n?nfy18SCuCNv%UoG)p6Ka
z0<wgaQ7IRF9;+CEU54~;vxu~tU89ti0}Yi~qr^u@OHbxi@UyMDmG6sd*#Fo&Xm*`>
zmpB>B{0p{^518Hci*<{%uczWa3Wd&I8%1VM@4INJh>1MUs3B9=S>+Q@xy=%mdJN;e
zZJmnLE2T?N$$d;aG$uzSbu@S})~zH3d58VVuQGxYhuG$FzQE<6`aMOQA<)4Vretgi
zshR5PlfiUh(m73Y_fMSQYGZh6_gxR`X7Xgu_RmMYu}=pZrdq9OrCbD>KNZcRJze@d
zfUL!I%VR4N2+)Vi^Q-N3NUa8bG~0EskFGu6&C?wpdM{tl@=do@U4XYxGN*W@mfd}G
zuedu;21wD5@7Y!PM0K7yWzHeh%jSH)=0-0SQ$iR9n=T?zO;xRn9b7{f>h&ej2qEIY
zJr|quNBKxqrKjh9-Q&0Lq49b4+Ti#y5TVTn!~s*e<<EiGNxL|B&)LPnUP0UWT1IbK
z+K#&p88Gh+-jNLE9&QGQS?>Pe4(u!q_+ikNcjQ;zctu4KM7I=d`cdr)Nlkk5GbCtJ
z?KA_;5qk$Q8{9oKdU%0B3f(*`o0g?uqB0^&N)ohXSy0*Iu6@f2{%9vR#RFTa`s|pn
z&B4`oH?-WTBGv9m=bFVYyoo3M{`<c=>M9Af0MLg;mklbQ?H8G;wT4p>D`_nmzoN_P
zHXFyMqg~jIM*RP9Wh6$C0s@|swNV#-u{PAyCaTDw^{X0?m+>&03==!$Xnua`Wa7TI
z!UzY;w{`{cNtiGduiT3Ug{Bqryz`trHlBXXn2YES&T~MI$rCAXqc7*R*AJc7L~ej)
z=2cE|sp?Mq(3p5S1(k2YZUZD7Z#8ZGN!XdGmOc#%*{6a;lYA}Ke&qFE^z`;pL7(%4
zmVawceXD<kuqG91NYvHmI8!Gv(!2b2Kvz<Haj#Z?16dYX4s_nC9!|YajB2XUdHive
zSKb`|<W-3tWI~k)c!7Db`UR(unR#iK)8L1d|A}B}7u;|wz?MqV1mINg@^0Ig-f}vs
z%kJT>uCC=)4H-;dthf!FUf$Tjt2=tOa8klDe{!QXIyhnS$rE5}awze8yX9(5`a@G_
z)m%-o9{X<BaBu=pIHD+>*)^|H$KX2h>|DCYpf5(O#Ce7_Mm96`h!Qa;;5mBw6>gCy
zY>PD<ZYxEmbTtuaeJw9Y{~7epSHZh3=?3+4sl}V*Vi9s*g6Y@0uUwtk2RJ;>y;BZm
zY!<vRE%fNU(QbKx&cB(~YWGG5;(NY4dW%PxpXZLa$vhaGeGyeo!}8EKVrY9a0hm`0
zY@+Ainy|{G_qE--&?r=Oe}Ru4BOc3zlL2Gi(D3U#gU)rjtn^;7f16RLDSUoP;WuM2
zts-N`kcG$IG&WVSt>)*2>_rX94`jDf06xc{Yc8rLN3y6HQUX}QmsgS*lK73poBhcL
zxw3jyZj4H4JD)t|Gj04y%3#7{+5Lg;3dtXe;!q^+m%?y_+PCYv&+lZq!hg4<wQt_$
zmp4imcZ4K_x5-qOZ3eS9)ik`n`f;bH?f$0P?9+v*_1H4Jjpbfi!^vV(7tS#85yZLK
z(ttA%`gC;3sJlvNtBr3uOX5bvt7hvPlhx9?WZOFOav-49=>dA|ZdvTn8%!Uy8{z70
zM@xXg^>Df917kB3AU9%NOMuqdA_|kX`-LpaYeX-l3%S_B@i1G=B%r?5s^e^FnJcpl
zbxucnRYn5+Sv+i<Zhq6ryL$brOjHJORM?MSO<wn4rp;%6W2``h$ULsRDZDV+7MoT0
z_^r^&yUNH-ugp@rv%NT6Z^ULUG3_E`#+%x-i8JF93#;Bj*G%}pe)~PRSj-bvcZ{E^
z8lXAyn{^D(G^1kJmV-d~V(!CLo-ZYHn7ZRM1?c*wbEGk(Zs-fOX{rkdS#_TPAvbW6
z@os;E8SLB|=*IBK-?U&u?Xo;ik?nbI=bB{BUE-#-S7=JxK!*O&B{SzA>eI$~Y0!@}
z;e8aTGji-rR6T>^;NB9c+AHEQ`>{I3<#%L>^o*bD?cRkDGh|I`Qn75qY#VRW3j|#k
zuTY-QbCSRL^3#9k%fp1HOA1*Ew~mU*DdxkE$r#z-9Uoo50rfSME~|2)0v|wqMNxse
zZ&(D1;XGjnc=#hpNBtHlr%SgRyx+?+A0UA8Vo3Hx6MMs&ui$L3lv3k9PxseWH^|Bu
zLwA5!DaE^x|D}!;Z4CV`qazwR>7Qk}Psr)CU+4a)VtKQBd@Yrych_fO_mHpY5yMi6
zSfKq=KFZrJ-qd}cEKzc`lFlW1=GH2ev+aD%H=*;>I-+b|h%jP=io3}D-E2O$xuOub
zZ_`Vxy2f66`-cRGufkrm$VB9IYPLoTEghLi#~*SE;A~&+V3RDBAhvT7I00eK-|~)*
zXjuEaTdHVZUiMaGE_$)uplRY4Ydud}rV)|8Ge4t@{Syzg%7B`r=hi#lg?I)@v)MLA
zG9Wse&jzQ{HZ~R12v{+zwi*0U>bz@CWqpQ}hsaIEsPl#zyCuGBvr>TtsjE>F039Ya
z*_cKqcK5%oc)&j1(oI$6ApO<{%`990)+aFt7xFqCySL`6jU@GZH%^Kk9v()l^3UNZ
zkEU!1Itvm$PBe0@EY@4ht&8wLopY$+C+mb{n~z%&aeI!B)vmVaZ)bbgw-Afg69J<7
z%Hglzn{sFDO<~SQ_U2?sx{>r*EOTBQw~_R60hDTR_WsFnjA26d%>M9`DJ3&|qh{Wb
z9%Vf<w=_lheo-i31z7t%XZK9EEoCo{fXZ~5fO<Y1FTPc(;j74;ox8;*5sdxoQTp$_
zne|CN;0lFWBffgIZWB&n!>>H%nK}@O#RrI`>~X*&&eyEYv#Yq|vX8Syyx@mZ0F*?v
z<GHbQNlmqz=<}F5f<MHB*l*gFgW`{i@uKr`<kt7iF%k7{g_rjkpkWaiYtPr@J_;V8
z{bubRS7%!j6ORwAN1L7f*y62@3r~$PQI%5K*e+Al_SGCEM9{$M4YmEFEs?^4-ZN<v
z3W1*W;w0$D8~l&K&*86f3^l*JhL*<(0k3rDa*P1ci^V;2;E5?U0VW0FHyO~HhJE+j
zm+h#&@Rl9`hH|Mdkq1iLf3>OqJ&luCx$kcIjc=#hwH)z&SR94zYWgD5c8MH%+J$@Z
zjo&?FpKwIbjJnhIQ~DETF874^_)|k|*Wu>-Hy>oMuIBSy+WgCV&EwYo=&rNcKUa|V
zA{xxR6NVSn8=!Kcqk<I&y_fW>z_Uod4zH1LtKMvk3do2u>DY=$xk;JhHEWv!)V!yW
zj%lT};iN0-F{?|%8_YLq;rmW+Fb~?RxVM;hcXIPeIPCc0R$hC*^il|xJfYkO$2?9a
zhi<{-i%zQ9;CmXa3z<5aqXC^HbuX}ppq<{N6%__xB}`n-)cdTHtdnKlvFE`XOzc4w
z8}vC8?4yb;636$d`xFj}!C?p3ZWeDFJ?A%WFVM82-;QI-(UDYXDSYzjO@}brdyQT+
zFKmuV2@=WdicVi}6>qlMAhzyZ7!?lHxL5bzfyP4#lkGaScdArdjwmQ5q62vnp5dF1
z{9#A(zHD9i)49OMC6|EiP(1G|BY*9Uq&5Gg_>9-|taB*&+qobmNXyeq;$lH&%xVht
z8MQ!|i9~_d)e|mWU*-7L)Fu~Htt`jI;@~{6`g;~YdbbWG8kaR(Z*&AbEdNM>v<+D~
zK=Op+NsbmAzGv(H$i8<8YThxbxT6xBIJ&wsx_j}Ogqy1MK>?FhAKJC&8sKv2(YNJd
z|EzNj{fHQS#JwN9$-jHDHFcIXlXF}1P^xy%v&gbTfq0<;ly~if7!434F7xJK;J<JH
zRnu|&sg&c`!<@GflYwsHQD@<+7qLl+?9Q`nDb?L3n%Z1&+h-dr3JgY~Z#Awg0-jfj
zS$Li`R!DNYiQp2LpT`o!iP3?MZu8IA!$|HhU5J@Z5-`-$-kjR4P8f(&_?_pB=$F(@
zC3G&E`*yx~tBCD$ZNmKJm47Cm|0$<Pg2b?jnP5)A+2>&0d3}G#xAj9&MtHtrCg2{L
z52gO)<yu)y`BR<CenFY3(WeWmdhkI`r}s;or3U+77GLa?41>?l(Z5;NXMbW|RJR0E
zUV6vdJVz})pAU$5qp95*;p%yamiw4cn(;;}wHm^Izq8<OVzMD4TyJ#TRb>U3t2Fg+
zPms1j+pE$+kBFhoQ^s!!#G)M-Q<nS5&~bx2HzB$$G?F2mc!jFylIT9O#7F71Fxzya
zU%&WT{}B2Ws80iLnL9H|?sA4|;J;+A#`^k~qNS7`|A17j7MGG)2UbG!!sO0g=SztF
z0Jal{!Vur~C4C|+;sE#ESyk@mnB=5S;*V|JoZB!hQ1tj}TbUHG#$zjOF9lLAlmdB}
z$1fdsT~=;M<~-Z2t8!x^1AZ9d)uQaQy_10_Ck&lK2}vHfjRh6!Y!qfpAAf1MuQeRh
zUb$e16XsaVq4ZUe#~uJ^tFdS_X#25OA*8^&mv4#Q^EJh`dB?nFv_`!5%Nrj~q>FC1
z2a5#?lV7%|pOOKya=!K5M^{IG;Sp25Jl$!rQJB9la$c%n)%!I4x(<d^L;8i_b84=y
zm56Gk6{-@2lyeF<5I%h(-Y9gmHKRPea7;Q`y?xR~TO~u9l(F9Ia}iF*=l4l6@FsEy
zTaW%bysoZpd)+Ci3sL2{sj*FG@0{$T^lQJ`5k1j!WLt^AA18^f(IvyutzwnicXWos
z7}_w?K_ew8B}pF2q;VUoGCKQ$0O}{m8U{l1@FDp(7)Wpx8*M0xEwN|&wJB{)$)#Gq
zMd0v_L}jWLZ1byG-BdIqPear>q~cZ3yKINjzK_^4Gi8X1&*P+-EAK3GhqhvP4WDoi
z4A~YL(l$3(^$s^2*9ee@eh>T3KyrCLrgZ-*V*hCnSWb@s@q{97PBYuZ%W+R(bE#RH
zGv>^Xxi(@k(6_#@`wCWT11#NK?HwwyGk?c=gNTu~EUNM8$a`aZTOoNXk@+t2hj){v
z#3wEZZM!=5#6$I$RY|>6Pl=S3wG2HZ#cNMSsJzQD?>8se?O;by4Ix!>1b<VH@HC}2
z{n;B=(c)E#7Ly;=m&s&-s}mJ8M=p9Q$Pa^N60xD&@9+5DC%E4RXq0mBF7uA)1qbrd
z4WuUxnb_*2vkQC_LFL;?y~(0lPh`sCYYrS&EYRy*dXjKI>u3cx<@A(o;cWZx%#Q;1
zV!0tiCA>_$#xLt#*}H#V^#0=X^=GQN@W}vWuNeyV;K$Ui(j$R4c56>b8I_IAF<A}K
zZKOJP;OTKU6{B}zMmb^`=&;?mXvBvn1B(V+{zH#ZC??S(NiO{k)bYR;iK}b7lCiaB
zfQdA+aYx)i@1f_mc;7hW`Yd4o+RuJyJJih2=2*mI^#SR6f&TFED&HF%Llq_*^wAYY
zlO|l~!TE9q5?Hdv0IX1@5)|Ld92Yn&<-o5Vx(05ap)NnEiu+P_>bpnW4MiRK=hc*q
z)%1*}d~YkZBwb&(4nA9lwO$ui-n%16-ipv!(N_mH!V2Sm<;j)4?O8)>;bEhxTe14n
z$#0HpQ#7Y$kKP`YI-Eq2ppYRn#Dx1$cntYX+UfqO9BO#)m{V$vDtzD9hx%`y^b_&Y
z(bNNK;i6S9&kauf8CUQ@bKv1*A@>xqf*_FFYN;M^D3o#k%|B`J1$!upD7we#wI?z*
zbGqK)NXV2cb=owtXH#yM_tpE2fqoxGm-FF?2&i^5hYVq-EkUY}4FN(}CXceYb?;!k
zzf`(dLYX*o5-}n$OY^%v6vuo-BKf1Y$M}uh^=Y=~X@OK888D<>wps=wOGv}9RAWE(
ztGm|qwz({@tJJ5>mdp%qXei7zu&0sp+Iz5xNkCv?!7EW8b_adrwj}+x?W<F|K1*yI
zcfmT)-^LY+`o7;^A&PCz1Z2W}Zu);pE>Y3amayD6ADP7ZX@zSvAGVjvy<g^KBxtl~
z^V@}1Cs@KnpqO3e&Q;-TCm+)6%hpTtJcn4K^pPv@depQ0=WzPnHLhB#+|;^8$NIKq
z8GP^uHey`Sq{Pe7k(0-^+qW)tga}6LuTd1myZxwPJ}tp~o9|7;mf<dW!f*jK3WX0u
zib0l=g@!}($6~h_r*+qY_-{fZvIGc1yBBiUHtex#($~z1JHYr>f0woQu#o+D)V+2h
zgRcB(6MViQx+W%XDTL?R5FOvY%M2vfE>VrG9IS1f!8%kb&09W54W65^svJC7*kB3x
zbhIR?2UL8xn&w9SHzX@QB0vyGc!HDVYiR{C77NdUhn{<h6%|JVxqB<6la}8Rdgo^e
z`=UC){u)_g^;6b)*adZ@bB0F@afnoUm@RAyGMqX<5b1+=i_cfs%c%zr*#>Q4ES}mP
z*>T24%F?0Naam$e%C05e`4<ET3u{X}M!4nGK+5X8e|hQLx3%%``ql-u26-kq&}%LR
zn?Rd)u&QUya@wHG;vQ2~RhY;PQvbA(Yaq{#qv(!v&^}>1pAJQ*ZFq)Hy7cbpdSOOA
zNvy-svNI^7){dNPW2Xc&{KCR8bd|!j=9uzzYn6_B@qwYz5Q$O*DTgp}rS^M)2B*-u
zS@~;q0z?Ep71k}<V~U3KT3{zXa3)G%_51QtoSnrHplUqKenSVv<Miayg{Z)xk28Dv
zfA(PAc2dt37HOKUqRa<nrM^bXy5uvMDwkzsq$WdOGVyrnY<{S@r_j?F8X79gX8H0;
zx7&@n^eq|i!5!?;#SLsg{IcaC`~Z8*5&fMS2bb)9JWi-a6IaA{?72rWU@Y!`nEqpe
e|L?uvmb3v9g!1bNPyc%=T}e(|woLkM@c#iLzn!}P

diff --git a/src/es/hentaila/res/mipmap-xxhdpi/ic_launcher.png b/src/es/hentaila/res/mipmap-xxhdpi/ic_launcher.png
index be66e4e24670941f8b8c065ece038b644aec9991..305a7f65fbef4bdfd5329ebc3681d331be3af69f 100644
GIT binary patch
literal 4764
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
a5`yHjOF8?^<Zr7^1iD&An$_w~k^cv(6vz1h

literal 11997
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

diff --git a/src/es/hentaila/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/hentaila/res/mipmap-xxxhdpi/ic_launcher.png
index be66e4e24670941f8b8c065ece038b644aec9991..f3ca7fab83a3a7bce28c1925bc344b413d0824c8 100644
GIT binary patch
literal 7021
zcmaJ`Wmr^exZT6xP%|LX(kh(;64H$V!XSv0bayj=z>rcRhm@2!q%=sQ1JaGsh(m*f
zlt?poIOp7-_x{*>KhNy<U2lA~XRT<2rYem1E-?TAuqTg|p5dP8n~M;FyFdHxL;wKv
z51%N>>mp5dU)m#|Pd5Lt5B}{N{3jTjl7Nq>QvBF%*sja%%%|Dd=<qt=<D{YE@ec>)
z*e5J;=6C3<o^i6^J+n%n%X26P6NV<2m?ws_Lh(YfvUc_=efR1Tvt27ZM`Wz_ycI@H
zWJWKtva$k4&Zi9bTBob0O)knl;NykJvD_y7zaA|2Hp`YwB_(nl%yg88zx8sLnL1XM
z|Clt^UdW%ReB7DH{%{QMsT}<nVLjfk8{<oNakyJoV+MEGYq1v-4-JL*Dc8-O-meG4
z++QC1Gw^=6veB`gM5g?uCv2%;F7FhPn#)yLXF|00J#Tnz@@Z-uVMLmisg8(Z^ACTR
z-ArPY*mK=C&pZ58_7%*fe&@pN-fUNu*q#1ab>)1`UyIL6*`rk`Vi&(%&55E{zEs%I
z&Df^mlP{XLgm6-_YuLTr9_P9QRsBAT=q`9s9|A8bv}#b*_u__8TgN;U9(9F0pp;;*
z?>kQCbn~t>;P)U3AT!D~fxB>5`Tw{Rj?jOokYrpO4a6o}IlrwwsVN%o$7?A_5eXaW
zis)RXm|OLK!>C_5KtW9$0M2__IX$yfwbA&1pOQLrjD6a12SK#EPDB#X9^Tq)VyWus
z#zCW{&$$D0TEe*vd(anDpVVe=i}>i@*(HBVq#o0Dy>jEVNJOn>!lJ<1=k3va6F{n?
z1Zw-IDMh4HM$2U5AQOdi*~c$PAi*j%=le?=FxkKY1a^#|)2>f*Lk>^hppWlLB16w+
z*sfW=aiXZ71B+bd{m&c$f5JEfMJ!R1i6w!SAk7!spuis0buFHp{{3<r>=>r=llt>f
zTlAqE!C06Jc_$xe`kAgrdk<-j8NUxraDsu=-H82^<wxB|SE_{SaV5SJpIsw0Dexu6
z*%u9C)Nr+TPz-fzf~{Jl4KFuzS&b1+&)W!7txGT@7fjxaX}6B!&t>1k6=v|Iop1e{
z1O1o4;Duv(3c{27N1RdWG0riiCFKmtrLDF)ThWEd{w`F7Ii`xGOCP}3RC|-#ecs6#
zZ4u7|oC+tBp}j7;-{neMo+f8hKRRW=zAqPdvD}Y2v7CUDjTGxDSET#6nq&V;Zt>?W
zbjemLl{C$tsBTU^zxtZXTQ>cyOr^%>rCf4%9S_%Wok4QT?k%;z;5&ttbQHHge+ixk
zX=6%!o$)t89LiY?SCt5xhLTZQfR6b6)j0mWBg4~O>-$^_{p7QLij0L~uhf3tFHYR3
z-?ceEn{iFHaE?Nft@po>`5~P7m7?+4dCCb_yMsU>MpEhLRWDayNyOLJd^H>Q;$5ZW
ze+p3gG8O%vx=PMDA}z!Quoe=$fq#q7zJGN-rGg@L6H?*<0_8ZQcOmZo420-hi)<gK
zP@J$_@#)2zTvE2gHse!}cb2{P7e-axjDjIrkJ_p0?7g@KtSk-IS;|}L0^;q2jg!!P
zDYz1wSxiN*^{lrxd*YyYI_$TfMh#pLZ;M%CtO96}51a$~ScGDr_gBt`-YOg%9?ZF~
za<L-Q<`&!*WDY+Gs};U<>`6>A_*9@_b~)OU$(|^7#&;N>BVy^%59V8yZp>)g-X5Y2
zc<hWfA!`_-3I0vi16rD8sVwFEcMdy2M*(**%L*qdzP2(n&-ii;6ZMrz`}KXzV9CcX
zh|-dC-yl84v6|u7h(~77@eFAtnrAk=-K*)bN?N=e+&tCLT0y7KYS0*811!9`C_mw!
zRZs^{1Sv#xl6;_l@r%6}>7o2$u8eKJ-*P|&tIz(<7}8|RKi+G4Na#<NOlJ2}GynP^
z9XO7k!Y~t9K~Y3^0-xrFLj~`BKJ929ZZk~m9!t}QejGOnD}kVLw?rvQ`Bke3G^%|B
zv<umoZwWa8abUsQ)Zo>7;U1R^Rf(%^Tu*i3J#k;yo#>q{_Ij^<7m)d|3*<mMv!J{(
zs3I@I0;K@kUx-#JeOMK<y8ja{3=wn?>+>--*bEkrb-9Qu_FpsGVHXa*g@7VTKtb2U
zRiRb~Jxs!oF@KxJF`q0^0Fo3dyUb-`V5jr4fnYt;FYYm1E)Rlq5y4q%H+IK?>a%B^
z>luq-`<<dWb1Bi%PnFhEU#aBM<|4pD6&u~}d6^6>dVslb=Yny(35e}=z(&jN0Nb05
z=?uTOayM9~n}P!8RtI4;!?gJ^82|FS2r}L8e&NMl*5JAqzQdwN?_cA}fVu@TY6lPq
zoUfutWE+YWZhKQ3zSZIDtlyO?{1o!nHs9IsQ@9)}q{-4>kYJZs^7BJWprW&3Z1b8^
zFaG}d-_gYrV%4XL!k_&(A)H;n+xDJVDTB6#Z@2=8=2bGagO1CLC|dDbyrurL5XP)4
z=kTi7rmr**&9m?)9*|gXU2SRkaR(C6%n_U1W4(c?obJ2y$fFB;K0`fc7#&h};rZ!J
z@z+K{tCsXV21>A!2>Rp7LS>S?*xH58kodjqt2&00q-Lp<Pp@V9#g4MWEKns7bb2?N
zW>%xX#YbEs^X|bWUvz#3yt^h7#ysMLL^+_CC2~MzvUdOUuyC!ZnR#FLoT*{wf89?7
zdL2<F*Tr;T+J2zHJ=Fj60kO$%YAV$c{ek<E-GDYsFi2Qn%j)38d|_aeL@217T^r*p
z)r|{+&bAcOs9wcr!sT?q6Jm$?n$#yl!j{#;J2Q5YE(t3iX6~L(X{X6K4j;Y8O(jl9
zlfRQ-?+)>8m`yg4VM@3)LKF-QNH0#5(tP>gZrRsBCpPQ@gE(W`by*TzVCbShQCG(|
z8))v+8PU1;02@9nHou`sb&6#7x39WopOUJ}2>l0)+;nY=O6o4+6{eH62gSg_zh8g$
zE&QAp5}d){!zl8<R)^juUHuBKVRvkF59Z^$FLnu#-2E%6buAX}j<v4sJ;Z&v4igFC
za+F{*deSsP*RXth$q%*#<|w$*FsbV*LG@~W@TSc*2WC<AK`g8AkVg#ydb=BtWWY#y
za9|+Te{*daulAaVDZ|PcM}b{w&4o(k?=s(ZoyJzwhi{A%MgcoDvh4NlOa}f23K*@U
zZZhjumenwJl;%h`v3KXBwHHxj7-qR~rrpoFe3Oa{IG4-YZ{0!MTsLu40Xnv;Zyj0o
zMk;0XpsA34!-Jvrz|`iPItFw|w^&NmW|!1m)~>=fn<lzyHUpdn9PsC;9X4%P3s?G)
z+UDQmkG>6F6-Mj!o{Vb#u+e??_ZnHYl}!h5s@Qu1H*1V`JoCV(()su$mC%xD2WgwE
z<$D8cHpy`VyvG~XnBx^Z&_kZx-lg+|n!~7dPiCW6BxCb!d=(+~9`+_(ez2MJ^#%vB
zhCQ|;RWgHENY1W>G8nUbDg!Y)+W2!CoNMvqQP!KXpl`g)DmUiFFE)IRN<805Hb%AQ
zIs!w$Ti%V*2X9;4#41It%#QuhOL21_&eD{kKpu39l?H8(law3OPjQ3X)84J~gb90O
z_-Ce3^spf5OZ*p`Gr^b}v(fmAa&@QqTsgUjA;22CNTL<!YEAAFLMRZj2+`l%FY^y)
zBey^qL-c>M3VgNFZtW<^?QD@<`l<D*O0?<T_MM7Svm-tu4YP_B`dEmT@F17cO{zN{
zQh}#q3I(D5R;ZYojuh)OaW9oZ#+*oN2y)_}vlC-vGpRrcwi1?WF6*kJ@pES<7`@+O
zpQtS#iSnp9(kDb*1-@Q^L#tQpIN8-tc0Zk6()U}G?Y5}VbOW<c6dg+%NngBCgFKhg
z<x;G5%Ou+W)il!k#jn%PlHJZ9>VN47N8)DNEOZ}@XOi5%ysJ{+QI0pz<FfF62&02p
z!nN%}QOmK$8)J5Oj9td4k?QyLSrTeP6NUjTNtu9=I;XH_382nz@6#(^54KhV-@TYk
z@ItI<qhdEK^`x;j9&$WE&UT0qPDq~(D%!|Tn?3e(`7e`4hFz&@!gMV&lsOP*FXT88
zx`9Vx-6dc36>FGY#Rf)$`jHQAVp$2J4SSC^PHHEU8h$B?9>$s?+x<i5tqB0pAIt7D
z%dgB>u{O1|pL*ih6yd00fT}D%{!v@R*q+1$yvA7bghTiu?DL*aTN0z-)q>Q4tzlVa
zaZ`Kmz1}e4E<hB#$WFU6yh8kXcJ4T|MfM!o7CF+=JwtdhJC;5*g|~^dWO;SUi}mq1
z-A|xXjkEwVLD$toyE1Z_^zR-M!-4p3SHBWAV`^Xnfg~+o8ykQ;Bu1w1b2h`LmUrGy
z!fDYqC@$A#5%dsZnzb0oyCZe+`e}hlqu8Nt;w_&LG*}#IEZSKTjQJAG`Y4y*^}R#S
zxE9n*44n#Tgdn-=Ly`p&7?zjny@Lfw-Tc53`|cF6JnA%$gGDC~R*GtQas6=vm%Na0
z8>j#U4dl4a>wv!t&hD~MAj1|0vv|l(cm688q)EJG=*^@m3rE=l#t%DUR9>9ht5ZCW
z6ipc5VA5PTCJNr@P{u8Nc-@aXX>2Cgy77)%btGKZJpJbFfw&q_^nh50nc>$I&|S^D
zDTz8#S>ma_VmCFv*UNA}(3g}Q>@o_D!m4?Qk6HYa|J_Bcs#Xzn%z{ecDkWL*Frc5X
ze%CkLw~l03W42@^`-lmfvWk*u?=il^3R#4_tDmd@^|->h*;+tj$Dl6|#Gb5MTgv?w
zcd(*S!lp|)x$CLtvBc%mYxVx+AkV6Ma6k+l8R!DrpC7xb%Z{@H2;XPkqW_xXj${U-
zL{t}2EjMCig>C$X4qz9fHOG2aUBChip{@R-gSrvYwBRwwwD;Aj0CQz-(Q2L1IwNB9
z*|w+Ka;*!le`o11CpLna);$W;32CZ{m->EdeE^uL9+-i!X<;8}WP+G{q}mB}YgF$X
zymPv72r=S(xfFObUT1--2K~yCXUe(pU=Fs|ef;3SizzlWG~K#<#riusjKsj0{4lqd
zX#3>IRGl>SX0NCQ<rr%+Rf3v?(20x&;pXJf;^04xUMYIw#umV0==@WGcQpr1PD+;)
z40}dijwkxvfH`==*~bys7Uk6LPU;2%7+k|b*=VeJ;}s6~Tdgl?lDaJyZuYfK$h)IT
zBe2w|SS#l#)~TKjn9pr$YayO6@-gLkK&HsBXAE~&Z=~(QAv!s_*#ei>e5q715mB$1
zw+%JW%WsF9kma*cmNhQ@Yv8t7esT-I8MWQ3)4Qbe3yNw!_fV%{Pecg`D__o7IE5WD
z%!j1+CMR)|t(8qmZ0*x^ntGY~e_a6XtIq(VReAAA8{g@2e`F;d(J9Ma!>Pd<foZq{
zI&!$K%O?5}y?fhWI!nU?1w&j6nnv7uxi>hqU^sJ$&C34verHCEk(dZQbr9z7CQv66
zl=?+P9=+fx@r?#-2Oj$1>xlY`p3kD%E81zIH=;XIM82|7{)~Z#H=RhJ7tj(9BAqvF
zO~rMj9;CPH<A^fluZ?0Y0}0(DiG|r(OwZ?*&!$N?lyn_nWhQso@sC<XSt)S9ZPS}0
zz_m(~&O2J(K!2WNcsYq~oHN3vZP235Yw&O!^TcrNXROZUbdsXolW=ILIZD2uG|;q8
z5}ehkxa#kA(1*>8-o@(O9Kga23p>2<4J&r$ZH8Yo{&&}yle6mqLG&U`>DAH7FX%q&
z6!6jp(`@uv_V-EFi63{rB`s!{--1c}pgltJw2C9vD3n?s3V@}Wjp-J{CBgg7h*#v4
zGuRV42Uvp$ZZnD4l~B=w3VKjzu^LDnmc4JF1t9Ng7AioeqMU~Km%*Zjt#WEn!=#NK
z_&#Dr7O{2~nyWwax}_ql;O4RaSnHqvWdy#oYEZ@}@1_t%UDFQ|8IR-xj+XC0#KC(#
z{VujOQ~2{uQ6O%|Qs-|nzL2H~O)u}w>)C3;Q!KPLr0RM^fcii;kwCOzfXYa|>qMow
zJ$~G+Q_BeI_C?$wV8hcFf@VZSA{1<oa9=Z<C!?;5xTD3CAaL_n&HgJYxmUpzU(#8=
z_XQv8!{xRYODFWO5t85?hg#hr(8Bv_qWVp0$ya~)QJH3+di831%u$A~!R8Zt)sHMt
zQx_XeBIrNh)Pc8lz<WDBA;*w<RvGc3o6iY>gc?s}1_+vB{Uzx5BJDZOTGiCs5txTP
zXy}dh5mLv@(O@?hL+9*!=W};9m)eI!moH8pwPn0H&o&Z(*fG}qr~tW99Xd3Gex;F%
z*JGKtJ;e?S;H&c(cQz!7WNH`Ofi$V43>H4r;-ky$+oJCVDs&o}L;yi1GS`MIxF^v9
zJAc%=dGE;to+qDH{SZ|!<re?Mb&}LaE7ZAk&<F<BRu2=j%nSgV-9Eb}&ySuDBa!nR
zW^K8!&NnK)b+y==26?4>b+!K?{iKRQy69B$_~eUvDC3%&n4TgD_IUNcK)o6})?S4l
z5c)$#+Acas$_U20L9tME9gLAmshaKBcBLl2^3Tinze@L)HFKf{$9Xk=xV6<N{q%<~
zM`{zu#>Lka<;1Cy;m*2sMCdltQMbTcvP;32CDegbo&TF9-iyGGY)HTztg$c`07a<v
z`LLb+e16$yl?xNJv5clSn~;FZ!4r0EGA`DS?k9zaqGMjNxu9&X`5~N;pw=N5)O?ZZ
zp5`(B91xI6*czHv3A*;Iq(zHVLzjA<_<+so%rtI4fH|W)(@HECH}8m|opo@3Vro9+
z9mSXbg7j$=v>-$O7DX5OY@Pm8XLG`>v=Zm-AUKL=(GQT#GLJEB1d!ccu3ri17lU6U
zSA%qI=8K#uz)hVw>=&~b+jR@tO1=j#ug$?47?Wkl=_DQ;MUt!WVahOk)DZOD!EYH4
z>(fR^Z}v^*8*ruG4>;VO__R?%%VJ+XQ`qHffY%8_P5Y7_y7tCagC_c`>R|}I@HaJT
zuqF!rItoQi2Qcsaa4@S$ILvJeukf>2G@Y4JG~MEC%Eb69J!k^ukLym#);Dv2@Yb0?
z7Y;&`2P`G{xyuMBCuaC)0!_eoGv6+yDw=VgfS~!(o`llpo)6z)!gmB43#YbS^>zd9
z1(DLqLNv#<cIEs}4`T$y&~5(qpi2U4*?QFGt4vxJ{<e8LsdTuQu-H^G*L{XZgTZ_<
zZn$mzHuw}G$ClgNv*s^9in8S=%eE)?W7={Vn<pB<cLzUYDAu)hj`j_y2gx~QzfLFV
zSX;{HZY7|3w;ZqFj55Hke!k1x1R`xfIP^WV2T8zyWqx)kV*>>3{^~nfeZ2scLQ!<V
z;F&-#0q$Tl;Dv130B(I=_n>jN#^LTCxV98FWrgM3_lH({EJVR^h8!<hz5t7h_Db_I
zIu#vkCUK#HBOl3!gE1KQVa_iK(Rzz>ME$!o4#H@j<F9!7uw1`D#_^`7O1%s+Q%7n*
zkDBA3+Y2^+zYf-(Vd%%c4(P-Zh=QHIzZl>{6Jn>DvLIt^?)S!H=c7sAKk=z-5d)v~
z3}_A=V4Rwp3yUXKQ0IzLYsg%f8=Q(aLOd6Wz}|Yv@UZ1AeXdj{NS6dbP0Nx<B*(jR
zJ`T-);!4gp|K#`hlGz{dvK+{?ROxcKEM?w3+|E%kp^<Aostf~daPTt&jb{s!WMKpn
z1OagmPocGFjBc2>@!6i;Bdwo3NfQkfA^dt%=Ma<(9vHvn=Ql`GG91vu-_l#GEggyc
zK{42$*^=Eh`97iXh|o_>gGtm}VnOZ4Z0u_3r&`}-1-a)SyU4(XpD&)nOBmW5ma*c0
zLeGEsDT^>2%zCA^DHiwXEC^w*n$_j+@@+M~&0^g<N?P5OQOgl3F7AQnY?UFac3E7P
z2v&#v(%S5?EUul@hh;w=?2YpD2fU*5BjaarMbiqqb}xQh37he54j;UK*|;8|i_mN_
zz7iTtHaZo*O6UF%Z)sZ^=t}WX`s4R$u$Oz0Cv;2|=4N=nlhRK@2VUehGecEYBAm);
zl}*;{4k6sy=IXz;bqh(KRe^i{I=SLnz3Po!y>h$j=c_>`ZUylxvpxvAe71kBdEB^V
z8X(5=<6%E$sJ}HYUW#`Cy_dh%$rD76Rg?fv1b9dOkzF}3wpTj4LbCgvjIiw$*M)j$
z^Ce)<lhQ&*BS)YzijNk=L)wf?3FDjXE%uq#3I~yo5hIMb+#A0aX}G+vkfsFL5X3o3
zQ&abM9{=qqXao$kP6}rB3Nyo7xZ{-pvILuB@=dE=9>*Op<7huL5qZnaX#LKkmZJy2
z^bcKWH#c1nGx!;twC0%mIRp%qwiB%~7u#H8XrSZo=qb`^UCRFm;VqZj=iY5psH2bM
z2-?oCEL#^AMZfaEn;oLSFC7T#gEtRq=-xLwA_Oo8?fjZs={XUse;IUA+-7?f{4a6m
zsV!+h7Wt8A><-I{-MJiPxFFe}d&5NitDp$P^dnq)o0OkrPb+?o&ockZAHLcVk{3je
zFR)q}XUfz5MRk9I$L?&0IKMJr6S$#i^WNt81k3$PL#t-zRsKRGnA7IP%FCPGez23d
zQ?^m*|C+S(TaGl9Y~Mcwxi;-cmS|{^Yt+aKb1p$+tb5FVkrevguuwX9R2cK)SbGAk
zYL3+i7G6dVzAoi|&?$)nC~z-ctNoqL!A<$+PJ<_on@xEf%VwTeEmj?Yqa{m}e2nhg
zNCLh$uS8IO!->@heJ_Pf<Eom1()@M%oNB}jJ)twMnejJb0<u%V+?A!iAD7mR*5X)M
zV!s+q647mq(@px1GYB&VKIDjjZxhF=+9hs3glEx;FB@@>>oMW<i3bh;2o(9HwGM4;
zxAVpx<tbN=cDYxV|H-_OQ>19~#<)@-xF5AR5a73Y+=QcqYMfq*WOr9vykd%C%4$;4
z;hkMXyYA8w1TdpR?@1`%atBdF^fP<XxfOq2;=7-u&*&}i@`Sl7<UNgFE8qJ5?k8#g
zJGpn1(st$3S!d4s1U*8M58^UE6~#y`z9H67x2~k<>lQNCnkD9=axSamKu<Oo#cVCr
z`aISbcf6a&xbXs+1W<D^G9pB74?e%TAmaYuD?;F#+P|BkV3&I<10|YEZr45ADf<7a
eQgUM)`&f?rOOv37fErFl1D+^rDpe|&h5io(c|I)w

literal 11997
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

diff --git a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
index 8608f344fd..99644d199e 100644
--- a/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
+++ b/src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
@@ -31,6 +31,8 @@ import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.IOException
 import java.lang.Exception
+import java.text.SimpleDateFormat
+import java.util.Locale
 
 class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
 
@@ -50,36 +52,43 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override fun popularAnimeRequest(page: Int) = GET(baseUrl, headers)
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
 
-    override fun popularAnimeParse(response: Response): AnimesPage {
-        val document = response.asJsoup()
-        val elements = document.select("section.latest-hentais div.slider > div.item")
-        val animes = elements.map { element ->
-            SAnime.create().apply {
-                setUrlWithoutDomain(element.select("h2.h-title a").attr("abs:href"))
-                title = element.selectFirst("h2.h-title a")!!.text()
-                thumbnail_url = element.selectFirst("figure.bg img")!!.attr("abs:src").replace("/fondos/", "/portadas/")
-            }
-        }
-        return AnimesPage(animes, false)
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "StreamWish",
+            "Voe",
+            "Arc",
+            "YourUpload",
+            "Mp4Upload",
+            "BurstCloud",
+        )
     }
 
-    override fun latestUpdatesRequest(page: Int) = GET(baseUrl, headers)
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/directorio?filter=popular&p=$page", headers)
 
-    override fun latestUpdatesParse(response: Response): AnimesPage {
+    override fun popularAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
-        val elements = document.select("section.hentai-list div.hentais article.hentai")
-        val animes = elements.map { element ->
+        val elements = document.select(".hentais .hentai")
+        val nextPage = document.select(".pagination .fa-arrow-right").any()
+        val animeList = elements.map { element ->
             SAnime.create().apply {
                 setUrlWithoutDomain(element.select("a").attr("abs:href"))
-                title = element.selectFirst("h2.h-title")!!.text()
-                thumbnail_url = element.selectFirst("figure img")!!.attr("abs:src")
+                title = element.selectFirst(".h-header .h-title")!!.text()
+                thumbnail_url = element.selectFirst(".h-thumb img")!!.attr("abs:src").replace("/fondos/", "/portadas/")
             }
         }
-        return AnimesPage(animes, false)
+        return AnimesPage(animeList, nextPage)
     }
 
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/directorio?filter=recent&p=$page", headers)
+
+    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
+
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
@@ -146,7 +155,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
             }
         }
 
-        val hasNextPage = document.select("a.btn.rnd.npd.fa-arrow-right").isEmpty().not()
+        val hasNextPage = document.select("a.btn.rnd.npd.fa-arrow-right").any()
 
         return AnimesPage(animes, hasNextPage)
     }
@@ -179,6 +188,10 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
                 episode_number = epNum.toFloat()
                 name = "Episodio $epNum"
                 url = "/ver/$animeId-$epNum"
+                date_upload = try {
+                    val date = it.select(".h-header time").text()
+                    SimpleDateFormat("MMMMM dd, yyyy", Locale.ENGLISH).parse(date).time
+                } catch (_: Exception) { System.currentTimeMillis() }
             }
             episodes.add(episode)
         }
@@ -199,10 +212,10 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
 
             when (nameServer.lowercase()) {
                 "streamwish" -> {
-                    videoList.addAll(StreamWishExtractor(client, headers).videosFromUrl(urlServer, "StreamWish "))
+                    videoList.addAll(StreamWishExtractor(client, headers).videosFromUrl(urlServer, videoNameGen = { "StreamWish:$it" }))
                 }
                 "voe" -> {
-                    val video = VoeExtractor(client).videoFromUrl(urlServer)
+                    val video = VoeExtractor(client).videoFromUrl(urlServer, prefix = "Voe:")
                     if (video != null) videoList.add(video)
                 }
                 "arc" -> {
@@ -225,29 +238,15 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toMutableList()
-            val userPreferredQuality = preferences.getString("preferred_quality", "YourUpload")
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in videoSorted) {
-                if (video.quality.startsWith(userPreferredQuality!!)) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            newList.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
-    private fun getNumberFromString(epsStr: String): Int {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }.toInt()
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
@@ -321,19 +320,28 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "YourUpload",
-            "BurstCloud",
-            "Voe",
-            "StreamWish",
-            "Mp4Upload",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("YourUpload")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -342,7 +350,6 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/jkanime/build.gradle b/src/es/jkanime/build.gradle
index 62f9d98e50..0bcb2665c5 100644
--- a/src/es/jkanime/build.gradle
+++ b/src/es/jkanime/build.gradle
@@ -5,12 +5,13 @@ ext {
     extName = 'Jkanime'
     pkgNameSuffix = 'es.jkanime'
     extClass = '.Jkanime'
-    extVersionCode = 16
+    extVersionCode = 17
     libVersion = '13'
 }
 
 dependencies {
     implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib-mixdrop-extractor'))
 }
 
 
diff --git a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
index 3ad637cfe6..ef7c422738 100644
--- a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
+++ b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
@@ -13,6 +13,7 @@ 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.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -23,7 +24,6 @@ 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 Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
@@ -41,6 +41,26 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[JAP]"
+        private val LANGUAGE_LIST = arrayOf("[JAP]", "[LAT]")
+
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Nozomi"
+        private val SERVER_LIST = arrayOf(
+            "Okru",
+            "Xtreme S",
+            "HentaiJk",
+            "Nozomi",
+            "Desu",
+        )
+    }
+
     override fun popularAnimeSelector(): String = "div.col-lg-12 div.list"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/top/")
@@ -99,7 +119,8 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val videos = mutableListOf<Video>()
         document.select("div.col-lg-12.rounded.bg-servers.text-white.p-3.mt-2 a").forEach { it ->
             val serverId = it.attr("data-id")
-            val lang = if (it.attr("class").contains("lg_3")) "[LAT]" else ""
+            val langClass = it.attr("class")
+            val lang = if (langClass.contains("lg_3")) "[LAT]" else if (langClass.contains("lg_1")) "[JAP]" else ""
             val scriptServers = document.selectFirst("script:containsData(var video = [];)")!!
             val url = scriptServers.data().substringAfter("video[$serverId] = '<iframe class=\"player_conte\" src=\"")
                 .substringBefore("\"")
@@ -107,12 +128,15 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 .replace("/jkvmixdrop.php?u=", "https://mixdrop.co/e/")
                 .replace("/jk.php?u=", "$baseUrl/")
 
-            when {
-                "ok" in url -> OkruExtractor(client).videosFromUrl(url, lang).forEach { videos.add(it) }
-                "stream/jkmedia" in url -> videos.add(Video(url, "${lang}Xtreme S", url))
-                "um2.php" in url -> JkanimeExtractor(client).getNozomiFromUrl(baseUrl + url, lang).let { if (it != null) videos.add(it) }
-                "um.php" in url -> JkanimeExtractor(client).getDesuFromUrl(baseUrl + url, lang).let { if (it != null) videos.add(it) }
-            }
+            try {
+                when {
+                    "ok" in url -> OkruExtractor(client).videosFromUrl(url, "$lang ").forEach { videos.add(it) }
+                    "mixdrop" in url -> MixDropExtractor(client).videosFromUrl(url, prefix = "$lang ").forEach { videos.add(it) }
+                    "stream/jkmedia" in url -> videos.add(Video(url, "$lang Xtreme S", url))
+                    "um2.php" in url -> JkanimeExtractor(client).getNozomiFromUrl(baseUrl + url, "$lang ").let { if (it != null) videos.add(it) }
+                    "um.php" in url -> JkanimeExtractor(client).getDesuFromUrl(baseUrl + url, "$lang ").let { if (it != null) videos.add(it) }
+                }
+            } catch (_: Exception) {}
         }
         return videos
     }
@@ -121,21 +145,18 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoUrlParse(document: Document) = throw Exception("not used")
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
-    private fun List<Video>.sortIfContains(item: String): List<Video> {
-        val newList = mutableListOf<Video>()
-        for (video in this) {
-            if (item in video.quality) {
-                newList.add(0, video)
-            } else {
-                newList.add(video)
-            }
-        }
-        return newList
-    }
-
     override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "Nozomi")!!
-        return sortIfContains(quality)
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
@@ -248,12 +269,10 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesFromElement(element: Element): SAnime {
         val anime = SAnime.create()
-        anime.setUrlWithoutDomain(
-            element.select("div.row.g-0 div.col-md-5.custom_thumb2 a").attr("href"),
-        )
-        anime.title = element.select("div.row.g-0 div.col-md-7 div.card-body h5.card-title a").text()
-        anime.thumbnail_url = element.select("div.row.g-0 div.col-md-5.custom_thumb2 a img").attr("src")
-        anime.description = element.select("div.row.g-0 div.col-md-7 div.card-body p.card-text.synopsis").text()
+        anime.setUrlWithoutDomain(element.select(".custom_thumb2 > a").attr("abs:href"))
+        anime.title = element.select(".card-title > a").text()
+        anime.thumbnail_url = element.select(".custom_thumb2 a img").attr("abs:src")
+        anime.description = element.select(".synopsis").text()
         return anime
     }
 
@@ -393,16 +412,28 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", // Okru
-            "Xtreme S", "HentaiJk", "Nozomi", "Desu", // video servers without resolution
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Nozomi")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -411,7 +442,22 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/locopelis/build.gradle b/src/es/locopelis/build.gradle
index 1a05fed23a..95453b2953 100644
--- a/src/es/locopelis/build.gradle
+++ b/src/es/locopelis/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'LocoPelis'
     pkgNameSuffix = 'es.locopelis'
     extClass = '.LocoPelis'
-    extVersionCode = 17
+    extVersionCode = 18
     libVersion = '13'
 }
 
diff --git a/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt b/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
index f8f6380bc5..2a824299f6 100644
--- a/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
+++ b/src/es/locopelis/src/eu/kanade/tachiyomi/animeextension/es/locopelis/LocoPelis.kt
@@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -24,7 +23,6 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import kotlin.Exception
 
@@ -40,12 +38,20 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val client: OkHttpClient = network.cloudflareClient
 
-    private val json: Json by injectLazy()
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "DoodStream"
+        private val SERVER_LIST = arrayOf("Okru", "DoodStream", "StreamTape")
+    }
+
     override fun popularAnimeSelector(): String = "ul.peliculas li.peli_bx"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/pelicula/peliculas-mas-vistas?page=$page")
@@ -91,13 +97,16 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         document.select(".tab_container .tab_content iframe").forEach { iframe ->
             val url = iframe.attr("src")
             val embedUrl = url.lowercase()
-            if (url.lowercase().contains("streamtape")) {
-                val video = StreamTapeExtractor(client).videoFromUrl(url, "Streamtape")
+            if (embedUrl.contains("streamtape")) {
+                val video = StreamTapeExtractor(client).videoFromUrl(url, "StreamTape")
                 if (video != null) {
                     videoList.add(video)
                 }
             }
-            if (url.lowercase().contains("doodstream") || url.lowercase().contains("dood")) {
+            if (embedUrl.contains("doodstream") ||
+                embedUrl.contains("dood") ||
+                embedUrl.contains("ds2play")
+            ) {
                 val video = try {
                     DoodExtractor(client).videoFromUrl(url, "DoodStream", true)
                 } catch (e: Exception) {
@@ -107,7 +116,7 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     videoList.add(video)
                 }
             }
-            if (url.lowercase().contains("okru")) {
+            if (embedUrl.contains("okru") || embedUrl.contains("ok.ru")) {
                 val videos = OkruExtractor(client).videosFromUrl(url)
                 videoList.addAll(videos)
             }
@@ -121,23 +130,6 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
-    override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "DoodStream")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
     private fun getNumberFromString(epsStr: String): String {
         return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
     }
@@ -242,25 +234,41 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = arrayOf(
-                "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", "Okru:144p", // Okru
-                "YourUpload", "DoodStream", "StreamTape",
-            ) // video servers without resolution
-            entryValues = arrayOf(
-                "Okru:1080p",
-                "Okru:720p",
-                "Okru:480p",
-                "Okru:360p",
-                "Okru:240p",
-                "Okru:144p", // Okru
-                "DoodStream",
-                "StreamTape",
-            ) // video servers without resolution
-            setDefaultValue("DoodStream")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -269,7 +277,6 @@ class LocoPelis : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/metroseries/build.gradle b/src/es/metroseries/build.gradle
index 8889910332..98ca0960f6 100644
--- a/src/es/metroseries/build.gradle
+++ b/src/es/metroseries/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'MetroSeries'
     pkgNameSuffix = 'es.metroseries'
     extClass = '.MetroSeries'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '13'
 }
 
diff --git a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
index e3db778dc0..0e0df78ea4 100644
--- a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
+++ b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
@@ -21,14 +21,17 @@ import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.json.Json
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.runBlocking
 import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -40,8 +43,6 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val lang = "es"
 
-    private val json: Json by injectLazy()
-
     override val supportsLatest = false
 
     override val client: OkHttpClient = network.cloudflareClient
@@ -50,6 +51,25 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "YourUpload"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload",
+            "BurstCloud",
+            "Voe",
+            "StreamWish",
+            "Mp4Upload",
+            "Fastream",
+            "Upstream",
+            "Filemoon",
+        )
+    }
+
     override fun popularAnimeRequest(page: Int) = GET("$baseUrl/series/page/$page", headers)
 
     override fun popularAnimeParse(response: Response): AnimesPage {
@@ -86,45 +106,85 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     override fun episodeListParse(response: Response): List<SEpisode> {
-        val episodes = mutableListOf<SEpisode>()
         val document = response.asJsoup()
-        document.select(".season-list li a")
-            .sortedByDescending { it.attr("data-season") }.map {
-                val post = it.attr("data-post")
-                val season = it.attr("data-season")
-                val objectNumber = document.select("#aa-season").attr("data-object")
+        val referer = response.request.url.toString()
+        val chunkSize = Runtime.getRuntime().availableProcessors()
+        val objectNumber = document.select("#aa-season").attr("data-object")
+        val episodes = document.select(".season-list li a")
+            .sortedByDescending { it.attr("data-season") }
+            .chunked(chunkSize).flatMap { chunk ->
+                chunk.parallelMap { season ->
+                    runCatching {
+                        val pages = getDetailSeason(season, objectNumber, referer)
+                        getPageEpisodeList(pages, referer, objectNumber, season.attr("data-season"))
+                    }.getOrNull()
+                }.filterNotNull().flatten()
+            }.sortedByDescending {
+                it.name.substringBeforeLast("-")
+            }.ifEmpty { emptyList() }
+        return episodes
+    }
+
+    private fun getDetailSeason(element: org.jsoup.nodes.Element, objectNumber: String, referer: String): IntRange {
+        try {
+            val post = element.attr("data-post")
+            val season = element.attr("data-season")
+            val formBody = FormBody.Builder()
+                .add("action", "action_select_season")
+                .add("season", season)
+                .add("post", post)
+                .add("object", objectNumber)
+                .build()
+
+            val request = Request.Builder()
+                .url("https://metroseries.net/wp-admin/admin-ajax.php")
+                .post(formBody)
+                .header("Origin", baseUrl)
+                .header("Referer", referer)
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .build()
+            val detail = client.newCall(request).execute().asJsoup()
+
+            val firstPage = try { detail.selectFirst("#aa-season > nav > span.page-numbers")?.text()?.toInt() ?: 1 } catch (_: Exception) { 1 }
+            val lastPage = try { detail.select(".pagination a.page-numbers:not(.next)").last()?.text()?.toInt() ?: firstPage } catch (_: Exception) { firstPage }
 
+            return firstPage.rangeTo(lastPage)
+        } catch (_: Exception) {
+            return 1..1
+        }
+    }
+
+    private fun getPageEpisodeList(pages: IntRange, referer: String, objectNumber: String, season: String): List<SEpisode> {
+        val episodes = mutableListOf<SEpisode>()
+        try {
+            pages.parallelMap {
                 val formBody = FormBody.Builder()
-                    .add("action", "action_select_season")
-                    .add("season", season)
-                    .add("post", post)
+                    .add("action", "action_pagination_ep")
+                    .add("page", "$it")
                     .add("object", objectNumber)
+                    .add("season", season)
                     .build()
 
-                val request = Request.Builder()
+                val requestPage = Request.Builder()
                     .url("https://metroseries.net/wp-admin/admin-ajax.php")
                     .post(formBody)
-                    .header("Origin", baseUrl)
-                    .header("Referer", response.request.url.toString())
+                    .header("authority", baseUrl.toHttpUrl().host)
+                    .header("Origin", "https://${baseUrl.toHttpUrl().host}")
+                    .header("Referer", referer)
                     .header("Content-Type", "application/x-www-form-urlencoded")
                     .build()
-                val docEpisodes = client.newCall(request).execute().asJsoup()
-
-                docEpisodes.select(".episodes-list li a").reversed().map {
-                    val epNumber = it.ownText().substringAfter("x").substringBefore("–").trim()
-                    val episode = SEpisode.create().apply {
-                        setUrlWithoutDomain(it.attr("abs:href"))
-                        name = "T$season - E$epNumber - ${it.ownText().substringAfter("–").trim()}"
-                        date_upload = try {
-                            SimpleDateFormat("dd-MM-yyyy", Locale.ENGLISH).parse(it.select("span").text()).time
-                        } catch (_: Exception) { System.currentTimeMillis() }
-                    }
-                    episodes.add(episode)
-                }
+
+                client.newCall(requestPage).execute().parseAsEpisodeList().also(episodes::addAll)
             }
+        } catch (_: Exception) { }
         return episodes
     }
 
+    private fun <A, B> Iterable<A>.parallelMap(f: suspend (A) -> B): List<B> =
+        runBlocking {
+            map { async(Dispatchers.Default) { f(it) } }.awaitAll()
+        }
+
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val videoList = mutableListOf<Video>()
@@ -180,7 +240,7 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
                         BurstCloudExtractor(client).videoFromUrl(src, headers = headers).let { videoList.addAll(it) }
                     }
                     if (src.contains("filemoon") || src.contains("moonplayer")) {
-                        FilemoonExtractor(client).videosFromUrl(src, headers = headers).let { videoList.addAll(it) }
+                        FilemoonExtractor(client).videosFromUrl(src, headers = headers, prefix = "Filemoon:").let { videoList.addAll(it) }
                     }
                 } catch (_: Exception) {}
             }
@@ -189,41 +249,40 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "Fastream:1080p")
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality == quality) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "YourUpload",
-            "BurstCloud",
-            "Voe",
-            "StreamWish",
-            "Mp4Upload",
-            "Fastream:1080p",
-            "Fastream:720p",
-            "Fastream:480p",
-            "Fastream:360p",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Fastream:1080p")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -232,7 +291,23 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
+        }.also(screen::addPreference)
+    }
+
+    private fun Response.parseAsEpisodeList(): List<SEpisode> {
+        return asJsoup().select(".episodes-list li a").reversed().mapIndexed { idx, it ->
+            val epNumber = try { it.ownText().substringAfter("x").substringBefore("–").trim() } catch (_: Exception) { "${idx + 1}" }
+            val season = it.ownText().substringBefore("x").trim()
+            SEpisode.create().apply {
+                setUrlWithoutDomain(it.attr("abs:href"))
+                name = "T$season - E$epNumber - ${it.ownText().substringAfter("–").trim()}"
+                episode_number = epNumber.toFloat()
+                date_upload = try {
+                    SimpleDateFormat("dd-MM-yyyy", Locale.ENGLISH).parse(it.select("span").text()).time
+                } catch (_: Exception) {
+                    System.currentTimeMillis()
+                }
+            }
         }
-        screen.addPreference(videoQualityPref)
     }
 }
diff --git a/src/es/pelisforte/build.gradle b/src/es/pelisforte/build.gradle
index 79a75c811c..d527ff925e 100644
--- a/src/es/pelisforte/build.gradle
+++ b/src/es/pelisforte/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'PelisForte'
     pkgNameSuffix = 'es.pelisforte'
     extClass = '.PelisForte'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '13'
 }
 
diff --git a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
index 71ca96660e..c0d5917c75 100644
--- a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
+++ b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
@@ -167,7 +167,7 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
                     lang.contains("Castellano", true) -> "[CAST]"
                     else -> ""
                 }
-                val locationsDdh = client.newCall(GET(player,headers = headers.newBuilder().add("referer", src).build()))
+                val locationsDdh = client.newCall(GET(player, headers = headers.newBuilder().add("referer", src).build()))
                     .execute().networkResponse.toString()
 
                 fetchUrls(locationsDdh).forEach {
@@ -183,7 +183,7 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
         val embedUrl = url.lowercase()
         try {
             if (embedUrl.contains("voe")) {
-                VoeExtractor(client).videoFromUrl(url, "${prefix}Voe")?.let { videoList.add(it) }
+                VoeExtractor(client).videoFromUrl(url, prefix = "${prefix}Voe:")?.let { videoList.add(it) }
             }
             if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
                 OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
@@ -203,7 +203,7 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
                 val docHeaders = headers.newBuilder()
                     .add("Referer", referer)
                     .build()
-                StreamWishExtractor(client, docHeaders).videosFromUrl(url, "${prefix}StreamWish").also(videoList::addAll)
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "${prefix}StreamWish:$it" }).also(videoList::addAll)
             }
             if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
                 DoodExtractor(client).videoFromUrl(url, "${prefix}DoodStream", false)?.let { videoList.add(it) }
@@ -316,7 +316,7 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
 
         ListPreference(screen.context).apply {
             key = PREF_LANGUAGE_KEY
-            title = "Preferred server"
+            title = "Preferred language"
             entries = LANGUAGE_LIST
             entryValues = LANGUAGE_LIST
             setDefaultValue(PREF_LANGUAGE_DEFAULT)
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 00f494c911..929bbae528 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Pelisplushd'
     pkgNameSuffix = 'es.pelisplushd'
     extClass = '.PelisplushdFactory'
-    extVersionCode = 44
+    extVersionCode = 45
     libVersion = '13'
 }
 
@@ -20,6 +20,11 @@ dependencies {
     implementation(project(':lib-dood-extractor'))
     implementation(project(':lib-voe-extractor'))
     implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib-burstcloud-extractor'))
+    implementation(project(':lib-fastream-extractor'))
+    implementation(project(':lib-upstream-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
 
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
index e14202de13..40749cad55 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
@@ -5,6 +5,7 @@ import android.content.SharedPreferences
 import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.StreamHideExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -12,15 +13,25 @@ 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.burstcloudextractor.BurstCloudExtractor
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -28,6 +39,7 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
 
 open class Pelisplushd(override val name: String, override val baseUrl: String) : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
@@ -37,22 +49,36 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
 
     override val client: OkHttpClient = network.cloudflareClient
 
+    private val json: Json by injectLazy()
+
     val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        const val PREF_QUALITY_KEY = "preferred_quality"
+        const val PREF_QUALITY_DEFAULT = "1080"
+        val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+        )
+    }
+
     override fun popularAnimeSelector(): String = "div.Posters a.Posters-link"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/series?page=$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create()
-        anime.setUrlWithoutDomain(
-            element.select("a").attr("href"),
-        )
-        anime.title = element.select("a div.listing-content p").text()
-        anime.thumbnail_url = element.select("a img").attr("src").replace("/w154/", "/w200/")
-        return anime
+        return SAnime.create().apply {
+            setUrlWithoutDomain(element.select("a").attr("abs:href"))
+            title = element.select("a div.listing-content p").text()
+            thumbnail_url = element.select("a img").attr("src").replace("/w154/", "/w200/")
+        }
     }
 
     override fun popularAnimeNextPageSelector(): String = "a.page-link"
@@ -62,19 +88,18 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
         val jsoup = response.asJsoup()
         if (response.request.url.toString().contains("/pelicula/")) {
             val episode = SEpisode.create().apply {
-                val epnum = 1
-                episode_number = epnum.toFloat()
+                episode_number = 1F
                 name = "PELÍCULA"
+                setUrlWithoutDomain(response.request.url.toString())
             }
-            episode.setUrlWithoutDomain(response.request.url.toString())
             episodes.add(episode)
         } else {
             jsoup.select("div.tab-content div a").forEachIndexed { index, element ->
-                val epNum = index + 1
-                val episode = SEpisode.create()
-                episode.episode_number = epNum.toFloat()
-                episode.name = element.text()
-                episode.setUrlWithoutDomain(element.attr("href"))
+                val episode = SEpisode.create().apply {
+                    episode_number = (index + 1).toFloat()
+                    name = element.text()
+                    setUrlWithoutDomain(element.attr("abs:href"))
+                }
                 episodes.add(episode)
             }
         }
@@ -93,8 +118,6 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
         val apiUrl = data.substringAfter("video[1] = '", "").substringBefore("';", "")
         val alternativeServers = document.select("ul.TbVideoNv.nav.nav-tabs li:not(:first-child)")
         if (apiUrl.isNotEmpty()) {
-            // val domainRegex = Regex("^(?:https?:\\/\\/)?(?:[^@\\/\\n]+@)?(?:www\\.)?([^:\\/?\\n]+)")
-            // val domainUrl = domainRegex.findAll(apiUrl).firstOrNull()?.value
             val apiResponse = client.newCall(GET(apiUrl)).execute().asJsoup()
             val encryptedList = apiResponse!!.select("#PlayerDisplay div[class*=\"OptionsLangDisp\"] div[class*=\"ODDIV\"] div[class*=\"OD\"] li")
             val regIsUrl = "https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)".toRegex()
@@ -114,12 +137,12 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                 }
 
                 if (!url.contains("?data=")) {
-                    serverVideoResolver(url, server)?.forEach { video -> videoList.add(video) }
+                    serverVideoResolver(url)?.forEach { video -> videoList.add(video) }
                 } else {
                     val apiPageSoup = client.newCall(GET(url)).execute().asJsoup()
                     val realUrl = apiPageSoup.selectFirst("iframe")?.attr("src")
                     if (realUrl != null) {
-                        serverVideoResolver(realUrl, server)?.forEach { video -> videoList.add(video) }
+                        serverVideoResolver(realUrl)?.forEach { video -> videoList.add(video) }
                     }
                 }
             }
@@ -140,68 +163,108 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                         "upload", "uqload" -> { serverUrl = "https://uqload.com/embed-$urlId.html" }
                     }
                 }
-                serverVideoResolver(serverUrl, serverName)?.forEach { video -> videoList.add(video) }
+                serverVideoResolver(serverUrl)?.forEach { video -> videoList.add(video) }
             }
         }
         return videoList
     }
 
-    private fun bytesToHex(bytes: ByteArray): String {
-        val hexArray = "0123456789ABCDEF".toCharArray()
-        val hexChars = CharArray(bytes.size * 2)
-        for (j in bytes.indices) {
-            val v = bytes[j].toInt() and 0xFF
-            hexChars[j * 2] = hexArray[v ushr 4]
-            hexChars[j * 2 + 1] = hexArray[v and 0x0F]
-        }
-        return String(hexChars)
-    }
-
-    private fun serverVideoResolver(url: String, server: String): List<Video>? {
+    private fun serverVideoResolver(url: String): List<Video> {
         val videoList = mutableListOf<Video>()
+        val embedUrl = url.lowercase()
         try {
-            if (server.lowercase() == "stp") {
-                StreamTapeExtractor(client).videoFromUrl(url, "StreamTape")?.let { videoList.add(it) }
-            } else if (server.lowercase() == "uwu") {
-                if (!url.contains("disable")) {
-                    val body = client.newCall(GET(url)).execute().asJsoup()
-                    if (body.select("script:containsData(var shareId)").toString()
-                            .isNotBlank()
-                    ) {
-                        val shareId =
-                            body.selectFirst("script:containsData(var shareId)")!!.data()
-                                .substringAfter("shareId = \"").substringBefore("\"")
-                        val amazonApiJson =
-                            client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
-                                .execute().asJsoup()
-                        val epId = amazonApiJson.toString().substringAfter("\"id\":\"")
-                            .substringBefore("\"")
-                        val amazonApi =
-                            client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
-                                .execute().asJsoup()
-                        val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":")
-                            .substringAfter("tempLink\":\"").substringBefore("\"")
-                        videoList.add(Video(videoUrl, "Amazon", videoUrl))
-                    }
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val body = client.newCall(GET(url)).execute().asJsoup()
+                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                        .substringAfter("shareId = \"").substringBefore("\"")
+                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                        .execute().asJsoup()
+                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                    val amazonApi =
+                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                            .execute().asJsoup()
+                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                    videoList.add(Video(videoUrl, "Amazon", videoUrl))
                 }
-            } else if (server.lowercase() == "voex") {
-                VoeExtractor(client).videoFromUrl(url, "Voex")?.let { videoList.add(it) }
-            } else if (server.lowercase() == "streamlare") {
-                videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
-            } else if (server.lowercase() == "doodstream") {
-                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
-                DoodExtractor(client).videoFromUrl(url2, "DoodStream", false)?.let { videoList.add(it) }
-            } else if (server.lowercase() == "upload") {
-                return YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            } else if (server.lowercase().contains("streamwish")) {
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
+                    .build()
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish")) {
                 val docHeaders = headers.newBuilder()
-                    .add("Referer", "$baseUrl/")
+                    .add("Origin", "https://streamwish.to")
+                    .add("Referer", "https://streamwish.to/")
                     .build()
-                StreamWishExtractor(client, docHeaders).videosFromUrl(url, "StreamWish")
-            } else if (server.contains("filemoon") || server.contains("moonplayer")) {
-                FilemoonExtractor(client).videosFromUrl(url, headers = headers).also(videoList::addAll)
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                DoodExtractor(client).videoFromUrl(url2, "DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
             }
-        } catch (_: Exception) {}
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url).forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
+                StreamHideExtractor(client).videosFromUrl(url, "StreamHide").let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("tomatomatela")) {
+                runCatching {
+                    val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
+                    val headers = headers.newBuilder()
+                        .set("authority", mainUrl)
+                        .set("accept", "application/json, text/javascript, */*; q=0.01")
+                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                        .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
+                        .set("sec-ch-ua-mobile", "?0")
+                        .set("sec-ch-ua-platform", "Windows")
+                        .set("sec-fetch-dest", "empty")
+                        .set("sec-fetch-mode", "cors")
+                        .set("sec-fetch-site", "same-origin")
+                        .set("x-requested-with", "XMLHttpRequest")
+                        .build()
+                    val token = url.substringAfter("/embed.html#")
+                    val urlRequest = "https://$mainUrl/details.php?v=$token"
+                    val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
+                    val bodyText = response.select("body").text()
+                    val json = json.decodeFromString<JsonObject>(bodyText)
+                    val status = json["status"]!!.jsonPrimitive!!.content
+                    val file = json["file"]!!.jsonPrimitive!!.content
+                    if (status == "200") { videoList.add(Video(file, "Tomatomatela", file, headers = null)) }
+                }
+            }
+        } catch (_: Exception) { }
         return videoList
     }
 
@@ -212,25 +275,18 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
     override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "Voex")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
-    fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
-    }
+    fun getNumberFromString(epsStr: String) = epsStr.filter { it.isDigit() }.ifEmpty { "0" }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
@@ -244,23 +300,21 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
             else -> GET("$baseUrl/peliculas?page=$page")
         }
     }
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        return popularAnimeFromElement(element)
-    }
+    override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element)
 
     override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
 
     override fun searchAnimeSelector(): String = popularAnimeSelector()
 
     override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create()
-        anime.title = document.selectFirst("h1.m-b-5")!!.text()
-        anime.thumbnail_url = document.selectFirst("div.card-body div.row div.col-sm-3 img.img-fluid")!!
-            .attr("src").replace("/w154/", "/w500/")
-        anime.description = document.selectFirst("div.col-sm-4 div.text-large")!!.ownText()
-        anime.genre = document.select("div.p-v-20.p-h-15.text-center a span").joinToString { it.text() }
-        anime.status = SAnime.COMPLETED
-        return anime
+        return SAnime.create().apply {
+            title = document.selectFirst("h1.m-b-5")!!.text()
+            thumbnail_url = document.selectFirst("div.card-body div.row div.col-sm-3 img.img-fluid")!!
+                .attr("src").replace("/w154/", "/w500/")
+            description = document.selectFirst("div.col-sm-4 div.text-large")!!.ownText()
+            genre = document.select("div.p-v-20.p-h-15.text-center a span").joinToString { it.text() }
+            status = SAnime.COMPLETED
+        }
     }
 
     override fun latestUpdatesNextPageSelector() = throw Exception("not used")
@@ -279,7 +333,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
     )
 
     private class GenreFilter : UriPartFilter(
-        "Tipos",
+        "Géneros",
         arrayOf(
             Pair("<selecionar>", ""),
             Pair("Peliculas", "peliculas"),
@@ -309,22 +363,34 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
 
     private class Tags(name: String) : AnimeFilter.Text(name)
 
-    public open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+    open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
         AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
         fun toUriPart() = vals[state].second
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Streamlare:1080p", "Streamlare:720p", "Streamlare:480p", "Streamlare:360p", "Streamlare:240p", // Streamlare
-            "StreamTape", "Amazon", "Voex", "DoodStream", "YourUpload",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Voex")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -333,7 +399,6 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
index 2f90593baf..91987b53cc 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
@@ -8,11 +8,16 @@ 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.lib.burstcloudextractor.BurstCloudExtractor
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -21,6 +26,7 @@ import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -33,6 +39,21 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
 
     override val supportsLatest = false
 
+    companion object {
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[SUB]", "[CAST]")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+            "StreamHide", "Tomatomatela",
+        )
+    }
+
     override fun popularAnimeSelector(): String = ".items-peliculas .item-pelicula"
 
     override fun popularAnimeNextPageSelector(): String = ".items-peliculas > a"
@@ -73,8 +94,8 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
             val episode = SEpisode.create().apply {
                 episode_number = 1F
                 name = "PELÍCULA"
+                setUrlWithoutDomain(response.request.url.toString())
             }
-            episode.setUrlWithoutDomain(response.request.url.toString())
             episodes.add(episode)
         } else {
             var index = 0
@@ -87,11 +108,11 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
                     val noEp = try {
                         getNumberFromString(ep.ownText())
                     } catch (_: Exception) { idx + 1 }
-
-                    val episode = SEpisode.create()
-                    episode.episode_number = index.toFloat()
-                    episode.name = "T$seasonNumber - E$noEp - ${ep.ownText()}"
-                    episode.setUrlWithoutDomain(baseUrl + ep.attr("href"))
+                    val episode = SEpisode.create().apply {
+                        episode_number = index.toFloat()
+                        name = "T$seasonNumber - E$noEp - ${ep.ownText()}"
+                        setUrlWithoutDomain(ep.attr("abs:href"))
+                    }
                     episodes.add(episode)
                 }
             }
@@ -115,10 +136,10 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
         document.select("[class*=server-item-]").map {
             val langIdx = getNumberFromString(it.attr("class").substringAfter("server-item-"))
             val langItem = document.select("li[data-id=\"$langIdx\"] a").text()
-            val lang = if (langItem.contains("Subtitulado")) "[Sub]" else if (langItem.contains("Latino")) "[Lat]" else "[Cast]"
+            val lang = if (langItem.contains("Subtitulado")) "[SUB]" else if (langItem.contains("Latino")) "[LAT]" else "[CAST]"
             it.select("li.tab-video").map { servers ->
                 val url = servers.attr("data-video")
-                loadExtractor(url, lang).let { videos ->
+                serverVideoResolver(url, lang).let { videos ->
                     videoList.addAll(videos)
                 }
             }
@@ -126,72 +147,119 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
         return videoList
     }
 
-    private fun loadExtractor(url: String, prefix: String = ""): List<Video> {
+    private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
         val videoList = mutableListOf<Video>()
         val embedUrl = url.lowercase()
-        if (embedUrl.contains("tomatomatela")) {
-            try {
-                val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
-                val headers = headers.newBuilder()
-                    .set("authority", mainUrl)
-                    .set("accept", "application/json, text/javascript, */*; q=0.01")
-                    .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
-                    .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
-                    .set("sec-ch-ua-mobile", "?0")
-                    .set("sec-ch-ua-platform", "Windows")
-                    .set("sec-fetch-dest", "empty")
-                    .set("sec-fetch-mode", "cors")
-                    .set("sec-fetch-site", "same-origin")
-                    .set("x-requested-with", "XMLHttpRequest")
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val body = client.newCall(GET(url)).execute().asJsoup()
+                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                        .substringAfter("shareId = \"").substringBefore("\"")
+                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                        .execute().asJsoup()
+                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                    val amazonApi =
+                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                            .execute().asJsoup()
+                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                    videoList.add(Video(videoUrl, "$prefix Amazon", videoUrl))
+                }
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
                     .build()
-                val token = url.substringAfter("/embed.html#")
-                val urlRequest = "https://$mainUrl/details.php?v=$token"
-                val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
-                val bodyText = response.select("body").text()
-                val json = json.decodeFromString<JsonObject>(bodyText)
-                val status = json["status"]!!.jsonPrimitive!!.content
-                val file = json["file"]!!.jsonPrimitive!!.content
-                if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
-            } catch (e: Exception) { }
-        }
-        if (embedUrl.contains("yourupload")) {
-            val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            videoList.addAll(videos)
-        }
-        if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
-            DoodExtractor(client).videoFromUrl(url, "$prefix DoodStream", false)
-                ?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("okru") || embedUrl.contains("ok.ru")) {
-            videoList.addAll(
-                OkruExtractor(client).videosFromUrl(url, prefix, true),
-            )
-        }
-        if (embedUrl.contains("voe")) {
-            VoeExtractor(client).videoFromUrl(url, "$prefix VoeCDN")?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
-            FilemoonExtractor(client).videosFromUrl(url, prefix)
-                .also(videoList::addAll)
-        }
-        if (embedUrl.contains("streamlare")) {
-            videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
-        }
-        if (embedUrl.contains("streamwish")) {
-            val docHeaders = headers.newBuilder()
-                .add("Referer", "$baseUrl/")
-                .build()
-            StreamWishExtractor(client, docHeaders).videosFromUrl(url, "StreamWish")
-        }
-        if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
-            StreamHideExtractor(client).videosFromUrl(url, "StreamHide")
-        }
-        if (embedUrl.contains("uqload")) {
-            UqloadExtractor(client).videosFromUrl(url)
-        }
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "$prefix Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish")) {
+                val docHeaders = headers.newBuilder()
+                    .add("Origin", "https://streamwish.to")
+                    .add("Referer", "https://streamwish.to/")
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "$prefix StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                DoodExtractor(client).videoFromUrl(url2, "$prefix DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url, prefix = "$prefix Fastream:").forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
+                StreamHideExtractor(client).videosFromUrl(url, "$prefix StreamHide").let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("tomatomatela")) {
+                runCatching {
+                    val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
+                    val headers = headers.newBuilder()
+                        .set("authority", mainUrl)
+                        .set("accept", "application/json, text/javascript, */*; q=0.01")
+                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                        .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
+                        .set("sec-ch-ua-mobile", "?0")
+                        .set("sec-ch-ua-platform", "Windows")
+                        .set("sec-fetch-dest", "empty")
+                        .set("sec-fetch-mode", "cors")
+                        .set("sec-fetch-site", "same-origin")
+                        .set("x-requested-with", "XMLHttpRequest")
+                        .build()
+                    val token = url.substringAfter("/embed.html#")
+                    val urlRequest = "https://$mainUrl/details.php?v=$token"
+                    val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
+                    val bodyText = response.select("body").text()
+                    val json = json.decodeFromString<JsonObject>(bodyText)
+                    val status = json["status"]!!.jsonPrimitive!!.content
+                    val file = json["file"]!!.jsonPrimitive!!.content
+                    if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
+                }
+            }
+        } catch (_: Exception) { }
         return videoList
     }
 
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
         AnimeFilter.Header("La busqueda por genero ignora los otros filtros"),
         GenreFilter(),
@@ -310,16 +378,28 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
     )
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "DoodStream",
-            "Voex",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Voex")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -328,7 +408,22 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
index 66177a4637..ce1ebc0270 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
@@ -9,23 +9,28 @@ 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.lib.burstcloudextractor.BurstCloudExtractor
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -38,6 +43,16 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
 
     override val supportsLatest = false
 
+    companion object {
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+        )
+    }
+
     override fun popularAnimeSelector(): String = "article.item"
 
     override fun popularAnimeNextPageSelector(): String = "a[rel=\"next\"]"
@@ -46,7 +61,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
-        anime.setUrlWithoutDomain(element.select("a").attr("href"))
+        anime.setUrlWithoutDomain(element.select("a").attr("abs:href"))
         anime.title = element.select("a h2").text()
         anime.thumbnail_url = element.select("a .item__image picture img").attr("data-src")
         return anime
@@ -57,6 +72,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
         anime.title = document.selectFirst(".home__slider_content div h1.slugh1")!!.text()
         anime.description = document.selectFirst(".home__slider_content .description")!!.text()
         anime.genre = document.select(".home__slider_content div:nth-child(5) > a").joinToString { it.text() }
+        anime.artist = document.selectFirst(".home__slider_content div:nth-child(7) > a")?.text()
         anime.status = SAnime.COMPLETED
         return anime
     }
@@ -68,8 +84,8 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
             val episode = SEpisode.create().apply {
                 episode_number = 1F
                 name = "PELÍCULA"
+                setUrlWithoutDomain(response.request.url.toString())
             }
-            episode.setUrlWithoutDomain(response.request.url.toString())
             episodes.add(episode)
         } else {
             var jsonscript = ""
@@ -88,10 +104,11 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
                     val season = jsonElement["season"]!!.jsonPrimitive!!.content
                     val title = jsonElement["title"]!!.jsonPrimitive!!.content
                     val ep = jsonElement["episode"]!!.jsonPrimitive!!.content
-                    val episode = SEpisode.create()
-                    episode.episode_number = index.toFloat()
-                    episode.name = "T$season - E$ep - $title"
-                    episode.setUrlWithoutDomain("${response.request.url}/season/$season/episode/$ep")
+                    val episode = SEpisode.create().apply {
+                        episode_number = index.toFloat()
+                        name = "T$season - E$ep - $title"
+                        setUrlWithoutDomain("${response.request.url}/season/$season/episode/$ep")
+                    }
                     episodes.add(episode)
                 }
             }
@@ -126,7 +143,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
                     fetchUrls(script).map {
                         val link = it.replace("https://sblanh.com", "https://lvturbo.com")
                             .replace(Regex("([a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+)=https:\\/\\/ww3.pelisplus.to.*"), "")
-                        loadExtractor(link).let { videos ->
+                        serverVideoResolver(link).let { videos ->
                             videoList.addAll(videos)
                         }
                     }
@@ -135,7 +152,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
                 val link = url.replace("https://sblanh.com", "https://lvturbo.com")
                     .replace(Regex("([a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+)=https:\\/\\/ww3.pelisplus.to.*"), "")
 
-                loadExtractor(link).let { videos ->
+                serverVideoResolver(link).let { videos ->
                     videoList.addAll(videos)
                 }
             }
@@ -143,73 +160,117 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
         return videoList
     }
 
-    private fun loadExtractor(url: String, prefix: String = ""): List<Video> {
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
+    private fun serverVideoResolver(url: String): List<Video> {
         val videoList = mutableListOf<Video>()
         val embedUrl = url.lowercase()
-        if (embedUrl.contains("tomatomatela")) {
-            try {
-                val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
-                val headers = headers.newBuilder()
-                    .set("authority", mainUrl)
-                    .set("accept", "application/json, text/javascript, */*; q=0.01")
-                    .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
-                    .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
-                    .set("sec-ch-ua-mobile", "?0")
-                    .set("sec-ch-ua-platform", "Windows")
-                    .set("sec-fetch-dest", "empty")
-                    .set("sec-fetch-mode", "cors")
-                    .set("sec-fetch-site", "same-origin")
-                    .set("x-requested-with", "XMLHttpRequest")
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val body = client.newCall(GET(url)).execute().asJsoup()
+                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                        .substringAfter("shareId = \"").substringBefore("\"")
+                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                        .execute().asJsoup()
+                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                    val amazonApi =
+                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                            .execute().asJsoup()
+                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                    videoList.add(Video(videoUrl, "Amazon", videoUrl))
+                }
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
                     .build()
-                val token = url.substringAfter("/embed.html#")
-                val urlRequest = "https://$mainUrl/details.php?v=$token"
-                val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
-                val bodyText = response.select("body").text()
-                val json = json.decodeFromString<JsonObject>(bodyText)
-                val status = json["status"]!!.jsonPrimitive!!.content
-                val file = json["file"]!!.jsonPrimitive!!.content
-                if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
-            } catch (_: Exception) { }
-        }
-        if (embedUrl.contains("yourupload")) {
-            val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            videoList.addAll(videos)
-        }
-        if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
-            DoodExtractor(client).videoFromUrl(url, "$prefix DoodStream", false)
-                ?.let { videoList.add(it) }
-        }
-
-        if (embedUrl.contains("okru") || embedUrl.contains("ok.ru")) {
-            videoList.addAll(
-                OkruExtractor(client).videosFromUrl(url, prefix, true),
-            )
-        }
-        if (embedUrl.contains("voe")) {
-            VoeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
-        }
-        if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
-            FilemoonExtractor(client).videosFromUrl(url, prefix)
-                .also(videoList::addAll)
-        }
-        if (embedUrl.contains("streamlare")) {
-            videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
-        }
-        if (embedUrl.contains("uqload")) {
-            UqloadExtractor(client).videosFromUrl(url)
-        }
-        if (embedUrl.contains("streamwish")) {
-            val docHeaders = headers.newBuilder()
-                .add("Referer", "$baseUrl/")
-                .build()
-            StreamWishExtractor(client, docHeaders).videosFromUrl(url, "StreamWish")
-        }
-        if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
-            StreamHideExtractor(client).videosFromUrl(url, "StreamHide")
-        }
-        if (embedUrl.contains("vudeo")) {
-            VudeoExtractor(client).videosFromUrl(url)
-        }
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish")) {
+                val docHeaders = headers.newBuilder()
+                    .add("Origin", "https://streamwish.to")
+                    .add("Referer", "https://streamwish.to/")
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                DoodExtractor(client).videoFromUrl(url2, "DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url).forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
+                StreamHideExtractor(client).videosFromUrl(url, "StreamHide").let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("vudeo") || embedUrl.contains("vudea")) {
+                VudeoExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("tomatomatela")) {
+                runCatching {
+                    val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
+                    val headers = headers.newBuilder()
+                        .set("authority", mainUrl)
+                        .set("accept", "application/json, text/javascript, */*; q=0.01")
+                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                        .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
+                        .set("sec-ch-ua-mobile", "?0")
+                        .set("sec-ch-ua-platform", "Windows")
+                        .set("sec-fetch-dest", "empty")
+                        .set("sec-fetch-mode", "cors")
+                        .set("sec-fetch-site", "same-origin")
+                        .set("x-requested-with", "XMLHttpRequest")
+                        .build()
+                    val token = url.substringAfter("/embed.html#")
+                    val urlRequest = "https://$mainUrl/details.php?v=$token"
+                    val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
+                    val bodyText = response.select("body").text()
+                    val json = json.decodeFromString<JsonObject>(bodyText)
+                    val status = json["status"]!!.jsonPrimitive!!.content
+                    val file = json["file"]!!.jsonPrimitive!!.content
+                    if (status == "200") { videoList.add(Video(file, "Tomatomatela", file, headers = null)) }
+                }
+            }
+        } catch (_: Exception) { }
         return videoList
     }
 
@@ -259,16 +320,28 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
     )
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Voex",
-            "DoodStream",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Voex")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -277,7 +350,6 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
     }
 }

From ab06aca71210be608c77c4850dc271fcae9d22d5 Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Thu, 26 Oct 2023 22:18:54 -0600
Subject: [PATCH 02/11] AnimeFenix updated

---
 src/es/animefenix/build.gradle                |   8 +-
 .../es/animefenix/Animefenix.kt               | 310 ++++++++++--------
 .../es/pelisforte/PelisForte.kt               |   4 +-
 3 files changed, 190 insertions(+), 132 deletions(-)

diff --git a/src/es/animefenix/build.gradle b/src/es/animefenix/build.gradle
index 69fdf890f0..db6a41764c 100644
--- a/src/es/animefenix/build.gradle
+++ b/src/es/animefenix/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Animefenix'
     pkgNameSuffix = 'es.animefenix'
     extClass = '.Animefenix'
-    extVersionCode = 29
+    extVersionCode = 30
     libVersion = '13'
 }
 
@@ -13,11 +13,17 @@ dependencies {
     implementation(project(':lib-mp4upload-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-yourupload-extractor'))
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-okru-extractor'))
     implementation(project(':lib-burstcloud-extractor'))
     implementation(project(':lib-streamwish-extractor'))
     implementation(project(':lib-filemoon-extractor'))
     implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib-fastream-extractor'))
+    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib-upstream-extractor'))
+    implementation(project(':lib-streamhidevid-extractor'))
 }
 
 
diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
index 433d061fed..799f836182 100644
--- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
+++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
@@ -7,30 +7,36 @@ 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.AnimesPage
 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.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.HttpUrl.Companion.toHttpUrl
 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.net.URLDecoder
 
-class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val name = "AnimeFenix"
 
@@ -42,117 +48,43 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val client: OkHttpClient = network.cloudflareClient
 
-    private val preferences: SharedPreferences by lazy {
-        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
-    }
-
-    override fun popularAnimeSelector(): String = "article.serie-card"
+    private val preferences: SharedPreferences by lazy { Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000) }
 
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/animes?order=likes&page=$page")
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
 
-    override fun popularAnimeFromElement(element: Element): SAnime {
-        val anime = SAnime.create().apply {
-            setUrlWithoutDomain(
-                element.select("figure.image a").attr("href"),
-            )
-            title = element.select("div.title h3 a").text()
-            thumbnail_url = element.select("figure.image a img").attr("src")
-            description = element.select("div.serie-card__information p").text()
-        }
-        return anime
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Amazon"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape",
+            "Fastream", "Filemoon", "StreamWish", "Okru",
+            "Amazon", "AmazonES", "Fireload", "FileLions"
+        )
     }
 
-    override fun popularAnimeNextPageSelector(): String = "ul.pagination-list li a.pagination-link:contains(Siguiente)"
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/animes?order=likes&page=$page")
 
-    override fun episodeListParse(response: Response): List<SEpisode> {
+    override fun popularAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
-
-        return document.select("ul.anime-page__episode-list.is-size-6 li").map { it ->
-            val epNum = it.select("a span").text().replace("Episodio", "")
-            SEpisode.create().apply {
-                episode_number = epNum.toFloat()
-                name = "Episodio $epNum"
-                setUrlWithoutDomain(it.select("a").attr("href"))
+        val elements = document.select("article.serie-card")
+        val nextPage = document.select("ul.pagination-list li a.pagination-link:contains(Siguiente)").any()
+        val animeList = elements.map { element ->
+            SAnime.create().apply {
+                setUrlWithoutDomain(element.select("figure.image a").attr("abs:href"))
+                title = element.select("div.title h3 a").text()
+                thumbnail_url = element.select("figure.image a img").attr("abs:src")
+                description = element.select("div.serie-card__information p").text()
             }
         }
+        return AnimesPage(animeList, nextPage)
     }
 
-    override fun episodeListSelector() = throw Exception("not used")
-
-    override fun episodeFromElement(element: Element) = throw Exception("not used")
-
-    override fun videoListParse(response: Response): List<Video> {
-        val document = response.asJsoup()
-        val videoList = mutableListOf<Video>()
-        val servers = document.selectFirst("script:containsData(var tabsArray)")!!.data()
-            .split("tabsArray").map { it.substringAfter("src='").substringBefore("'").replace("amp;", "") }
-            .filter { it.contains("https") }
-
-        servers.forEach { server ->
-            val decodedUrl = URLDecoder.decode(server, "UTF-8")
-            val realUrl = try {
-                client.newCall(GET(decodedUrl)).execute().asJsoup().selectFirst("script")!!
-                    .data().substringAfter("src=\"").substringBefore("\"")
-            } catch (e: Exception) { "" }
-
-            try {
-                when {
-                    realUrl.contains("ok.ru") || realUrl.contains("okru") -> OkruExtractor(client).videosFromUrl(realUrl).let { videoList.addAll(it) }
-                    realUrl.contains("filemoon") || realUrl.contains("moonplayer") -> FilemoonExtractor(client).videosFromUrl(realUrl, headers = headers).let { videoList.addAll(it) }
-                    realUrl.contains("burstcloud") || realUrl.contains("burst") -> BurstCloudExtractor(client).videoFromUrl(realUrl, headers = headers).let { videoList.addAll(it) }
-                    realUrl.contains("streamwish") || realUrl.contains("embedwish") -> StreamWishExtractor(client, headers).videosFromUrl(realUrl).let { videoList.addAll(it) }
-                    realUrl.contains("streamtape") -> StreamTapeExtractor(client).videoFromUrl(realUrl, "StreamTape")?.let { videoList.add(it) }
-                    realUrl.contains("mp4upload") -> Mp4uploadExtractor(client).videosFromUrl(realUrl, headers).let { videoList.addAll(it) }
-                    realUrl.contains("yourupload") -> YourUploadExtractor(client).videoFromUrl(realUrl, headers = headers).let { videoList.addAll(it) }
-                    realUrl.contains("voe") -> VoeExtractor(client).videoFromUrl(realUrl)?.let { videoList.add(it) }
-                    realUrl.contains("/stream/amz.php?") -> {
-                        val video = amazonExtractor(baseUrl + realUrl.substringAfter(".."))
-                        if (video.isNotBlank()) {
-                            if (realUrl.contains("&ext=es")) {
-                                videoList.add(Video(video, "Amazon ES", video))
-                            } else {
-                                videoList.add(Video(video, "Amazon", video))
-                            }
-                        }
-                    }
-                    realUrl.contains("/stream/fl.php") -> {
-                        val video = realUrl.substringAfter("/stream/fl.php?v=")
-                        if (client.newCall(GET(video)).execute().code == 200) {
-                            videoList.add(Video(video, "FireLoad", video))
-                        }
-                    }
-                }
-            } catch (_: Exception) { }
-        }
-        return videoList.filter { it.url.contains("https") || it.url.contains("http") }
-    }
-
-    override fun videoListSelector() = throw Exception("not used")
-
-    override fun videoUrlParse(document: Document) = throw Exception("not used")
-
-    override fun videoFromElement(element: Element) = throw Exception("not used")
-
-    override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "Amazon")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/animes?order=added&page=$page")
 
-    private fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
-    }
+    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val yearFilter = filters.find { it is YearFilter } as YearFilter
@@ -190,19 +122,137 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
+    override fun searchAnimeParse(response: Response) = popularAnimeParse(response)
 
-    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        return document.select("ul.anime-page__episode-list.is-size-6 li").map { it ->
+            val epNum = it.select("a span").text().replace("Episodio", "")
+            SEpisode.create().apply {
+                episode_number = epNum.toFloat()
+                name = "Episodio $epNum"
+                setUrlWithoutDomain(it.select("a").attr("abs:href"))
+            }
+        }
+    }
 
-    override fun searchAnimeSelector(): String = popularAnimeSelector()
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val videoList = mutableListOf<Video>()
+        val servers = document.selectFirst("script:containsData(var tabsArray)")!!.data()
+            .split("tabsArray").map { it.substringAfter("src='").substringBefore("'").replace("amp;", "") }
+            .filter { it.contains("https") }
+
+        servers.forEach { server ->
+            val decodedUrl = URLDecoder.decode(server, "UTF-8")
+            val realUrl = try {
+                client.newCall(GET(decodedUrl)).execute().asJsoup().selectFirst("script")!!
+                    .data().substringAfter("src=\"").substringBefore("\"")
+            } catch (e: Exception) { "" }
+
+            try {
+                serverVideoResolver(realUrl).let { videoList.addAll(it) }
+            } catch (_: Exception) { }
+        }
+        return videoList.filter { it.url.contains("https") || it.url.contains("http") }
+    }
 
-    override fun animeDetailsParse(document: Document): SAnime {
-        val anime = SAnime.create().apply {
+    private fun serverVideoResolver(url: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val embedUrl = url.lowercase()
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val video = amazonExtractor(baseUrl + url.substringAfter(".."))
+                if (video.isNotBlank()) {
+                    if (url.contains("&ext=es")) {
+                        videoList.add(Video(video, "AmazonES", video))
+                    } else {
+                        videoList.add(Video(video, "Amazon", video))
+                    }
+                }
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
+                    .build()
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("embedwish") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish")) {
+                val docHeaders = headers.newBuilder()
+                    .add("Origin", "https://streamwish.to")
+                    .add("Referer", "https://streamwish.to/")
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                DoodExtractor(client).videoFromUrl(url, "DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
+                StreamHideVidExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("/stream/fl.php")) {
+                val video = url.substringAfter("/stream/fl.php?v=")
+                if (client.newCall(GET(video)).execute().code == 200) {
+                    videoList.add(Video(video, "FireLoad", video))
+                }
+            }
+            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
+                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" }).also(videoList::addAll)
+            }
+        } catch (_: Exception) { }
+        return videoList
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
+    }
+
+    override fun animeDetailsParse(response: Response): SAnime {
+        val document = response.asJsoup()
+        return SAnime.create().apply {
             title = document.select("h1.title.has-text-orange").text()
             genre = document.select("a.button.is-small.is-orange.is-outlined.is-roundedX").joinToString { it.text() }
             status = parseStatus(document.select("div.column.is-12-mobile.xis-3-tablet.xis-3-desktop.xhas-background-danger.is-narrow-tablet.is-narrow-desktop a").text())
         }
-        return anime
     }
 
     private fun parseStatus(statusString: String): Int {
@@ -213,14 +263,6 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
-
-    override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
-
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/animes?order=added&page=$page")
-
-    override fun latestUpdatesSelector() = popularAnimeSelector()
-
     private fun amazonExtractor(url: String): String {
         val document = client.newCall(GET(url)).execute().asJsoup()
         val videoURl = document.selectFirst("script:containsData(sources: [)")!!.data()
@@ -340,16 +382,12 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", "Okru:144p", // Okru
-            "Amazon", "AmazonES", "StreamTape", "Fireload", "Mp4upload", "YourUpload", "StreamWish"
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Amazon")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -358,8 +396,22 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            summary = "%s"
 
-        screen.addPreference(videoQualityPref)
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
index c0d5917c75..5c4b5e589f 100644
--- a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
+++ b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
@@ -62,8 +62,8 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
         private const val PREF_SERVER_KEY = "preferred_server"
         private const val PREF_SERVER_DEFAULT = "StreamWish"
         private val SERVER_LIST = arrayOf(
-            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
-            "Upload", "BurstCloud", "Upstream", "StreamTape", "Doodstream",
+            "YourUpload", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape",
             "Fastream", "Filemoon", "StreamWish", "Okru",
         )
     }

From 0576551d8efd58cd3834a48c9487bdd1b152954e Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Fri, 27 Oct 2023 00:00:13 -0600
Subject: [PATCH 03/11] AnimeID updated

---
 .../animeextension/es/animeid/AnimeID.kt      | 101 +++++++-----------
 .../es/pelisplushd/Pelisplusph.kt             |   4 +-
 2 files changed, 38 insertions(+), 67 deletions(-)

diff --git a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
index ad2bee918c..40fe6bf243 100644
--- a/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
+++ b/src/es/animeid/src/eu/kanade/tachiyomi/animeextension/es/animeid/AnimeID.kt
@@ -28,7 +28,6 @@ import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
-import java.net.URI
 import java.text.SimpleDateFormat
 import java.util.Date
 
@@ -52,7 +51,7 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun popularAnimeSelector(): String = "#result article.item"
 
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/series?sort=newest&pag=$page")
+    override fun popularAnimeRequest(page: Int) = GET("$baseUrl/series?sort=views&pag=$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
@@ -65,12 +64,11 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun popularAnimeNextPageSelector(): String = "#paginas ul li:nth-last-child(2) a"
 
-    // override fun episodeListSelector() = "ul.ListCaps li a"
     override fun episodeListSelector() = throw Exception("not used")
 
     override fun episodeListParse(response: Response): List<SEpisode> {
         val document = response.asJsoup()
-        var animeId = document.select("#ord").attr("data-id")
+        val animeId = document.select("#ord").attr("data-id")
         return episodeJsonParse(response.request.url.toString(), animeId)
     }
 
@@ -86,15 +84,15 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 .set("Accept-Language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
                 .build()
 
-            var responseString = client.newCall(GET("https://www.animeid.tv/ajax/caps?id=$animeId&ord=DESC&pag=$nextPage", headers))
+            val responseString = client.newCall(GET("https://www.animeid.tv/ajax/caps?id=$animeId&ord=DESC&pag=$nextPage", headers))
                 .execute().asJsoup().body()!!.toString().substringAfter("<body>").substringBefore("</body>")
             val jObject = json.decodeFromString<JsonObject>(responseString)
-            var listCaps = jObject["list"]!!.jsonArray
+            val listCaps = jObject["list"]!!.jsonArray
             listCaps!!.forEach { cap ->
-                var capParsed = cap.jsonObject
+                val capParsed = cap.jsonObject
                 val epNum = capParsed["numero"]!!.jsonPrimitive.content!!.toFloat()
                 val episode = SEpisode.create()
-                var dateUpload = manualDateParse(capParsed["date"]!!.jsonPrimitive.content!!.toString())
+                val dateUpload = manualDateParse(capParsed["date"]!!.jsonPrimitive.content!!.toString())
                 episode.episode_number = epNum
                 episode.name = "Episodio $epNum"
                 dateUpload!!.also { episode.date_upload = it }
@@ -126,28 +124,17 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val document = response.asJsoup()
         val videoList = mutableListOf<Video>()
         document.select("#partes div.container li.subtab div.parte").forEach { script ->
-            var jsonString = script.attr("data")
+            val jsonString = script.attr("data")
             val jsonUnescape = unescapeJava(jsonString)!!.replace("\\", "")
-            val url = jsonUnescape!!.substringAfter("src=\"").substringBefore("\"").replace("\\\\", "\\")
-            val quality = getDomainName(url)
-            if (quality == "streamtape") {
-                val video = StreamTapeExtractor(client).videoFromUrl(url, "Streamtape")
-                if (video != null) {
-                    videoList.add(video)
-                }
+            val url = jsonUnescape.substringAfter("src=\"").substringBefore("\"").replace("\\\\", "\\")
+            if (url.contains("streamtape")) {
+                StreamTapeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
             }
         }
         return videoList
     }
 
-    private fun getDomainName(url: String?): String? {
-        val uri = URI(url)
-        val domain: String = uri.host
-        val preDomain = if (domain.startsWith("www.")) domain.substring(4)!!.split(".") else domain!!.split(".")
-        return if (preDomain.count() == 3) preDomain[1] else preDomain[0]
-    }
-
-    private fun unescapeJava(escaped: String): String? {
+    private fun unescapeJava(escaped: String): String {
         var escaped = escaped
         if (escaped.indexOf("\\u") == -1) return escaped
         var processed = ""
@@ -165,9 +152,7 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun animeDetailsParse(document: Document): SAnime {
         val anime = SAnime.create()
-        anime.thumbnail_url = externalOrInternalImg(
-            document.selectFirst("#anime figure img.cover")!!.attr("src"),
-        )
+        anime.thumbnail_url = document.selectFirst("#anime figure img.cover")!!.attr("abs:src")
         anime.title = document.selectFirst("#anime section hgroup h1")!!.text()
         anime.description = document.selectFirst("#anime section p.sinopsis")!!.text().removeSurrounding("\"")
         anime.genre = document.select("#anime section ul.tags li a").joinToString { it.text() }
@@ -181,37 +166,17 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
-    override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "StreamTape")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
-    private fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
-    }
-
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         val filterList = if (filters.isEmpty()) getFilterList() else filters
         val genreFilter = filterList.find { it is GenreFilter } as GenreFilter
+        val orderByFilter = filters.find { it is OrderByFilter } as OrderByFilter
 
-        var request = when {
-            query.isNotBlank() -> GET("$baseUrl/buscar?q=$query&pag=$page&sort=newest")
-            genreFilter.state != 0 -> GET("$baseUrl/genero/${genreFilter.toUriPart()}?pag=$page&sort=newest")
-            else -> GET("$baseUrl/series?sort=newest&pag=$page")
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/buscar?q=$query&pag=$page&sort=${orderByFilter.toUriPart()}")
+            genreFilter.state != 0 -> GET("$baseUrl/genero/${genreFilter.toUriPart()}?pag=$page&sort=${orderByFilter.toUriPart()}")
+            orderByFilter.state != 0 -> GET("$baseUrl/series?sort=${orderByFilter.toUriPart()}&pag=$page")
+            else -> popularAnimeRequest(page)
         }
-        return request
     }
 
     override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
@@ -223,10 +188,11 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
         AnimeFilter.Header("La busqueda por texto ignora el filtro"),
         GenreFilter(),
+        OrderByFilter(),
     )
 
     private class GenreFilter : UriPartFilter(
-        "Generos",
+        "Géneros",
         arrayOf(
             Pair("<Selecionar>", ""),
             Pair("+18", "18"),
@@ -356,9 +322,15 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         fun toUriPart() = vals[state].second
     }
 
-    private fun externalOrInternalImg(url: String): String {
-        return if (url.contains("https")) url else "$baseUrl/$url"
-    }
+    private class OrderByFilter : UriPartFilter(
+        "Ordenar Por",
+        arrayOf(
+            Pair("<Seleccionar>", ""),
+            Pair("Recientes", "newest"),
+            Pair("A-Z", "asc"),
+            Pair("Más vistos", "views"),
+        ),
+    )
 
     private fun parseStatus(statusString: String): Int {
         return when {
@@ -372,17 +344,17 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
 
-    override fun latestUpdatesRequest(page: Int) = popularAnimeRequest(page)
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/series?sort=newest&pag=$page")
 
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
+        ListPreference(screen.context).apply {
             key = "preferred_quality"
-            title = "Preferred quality"
-            entries = arrayOf("Stape", "Streamtape", "hd", "sd", "low", "lowest", "mobile")
-            entryValues = arrayOf("Stape", "Streamtape", "hd", "sd", "low", "lowest", "mobile")
-            setDefaultValue("Streamtape")
+            title = "Preferred server"
+            entries = arrayOf("StreamTape")
+            entryValues = arrayOf("StreamTape")
+            setDefaultValue("StreamTape")
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -391,7 +363,6 @@ class AnimeID : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
index 91987b53cc..3302f7a8a7 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
@@ -100,9 +100,9 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
         } else {
             var index = 0
             jsoup.select(".item-season").reversed().mapIndexed { idxSeas, season ->
-                val seasonNumber = try {
+                val seasonNumber = runCatching {
                     getNumberFromString(season.selectFirst(".item-season-title")!!.ownText())
-                } catch (_: Exception) { idxSeas + 1 }
+                }.getOrElse { idxSeas + 1 }
                 season.select(".item-season-episodes a").reversed().mapIndexed { idx, ep ->
                     index += 1
                     val noEp = try {

From 0b82bb391c8e92d6f16ec8aadebdf636a0dbc936 Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sat, 28 Oct 2023 17:56:09 -0600
Subject: [PATCH 04/11] AnimeLatinoHD updated

---
 src/es/animelatinohd/build.gradle             |   1 +
 .../es/animelatinohd/AnimeLatinoHD.kt         | 206 +++++++++---------
 .../animeextension/es/gnula/Gnula.kt          |  22 +-
 3 files changed, 119 insertions(+), 110 deletions(-)

diff --git a/src/es/animelatinohd/build.gradle b/src/es/animelatinohd/build.gradle
index 8a8ca2480f..02cb3f98e4 100644
--- a/src/es/animelatinohd/build.gradle
+++ b/src/es/animelatinohd/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-okru-extractor'))
     implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib-streamwish-extractor'))
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
index a74f3cda88..52494c8fc0 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
@@ -12,14 +12,14 @@ import eu.kanade.tachiyomi.animesource.model.AnimesPage
 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.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
@@ -27,16 +27,15 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.HttpUrl.Companion.toHttpUrl
 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 uy.kohesive.injekt.injectLazy
 
-class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+class AnimeLatinoHD : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val name = "AnimeLatinoHD"
 
@@ -54,13 +53,31 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override fun popularAnimeSelector(): String = "#__next main[class*='Animes_container'] div[class*='ListAnimes_box'] div[class*='ListAnimes'] div[class*='AnimeCard_anime']"
+    companion object {
+        const val PREF_QUALITY_KEY = "preferred_quality"
+        const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "FileLions"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+            "FileLions", "StreamHideVid", "SolidFiles", "Od.lk", "CldUp",
+        )
+
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[SUB]")
+    }
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/animes/populares")
 
     override fun popularAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
         val animeList = mutableListOf<SAnime>()
+        val url = response.request.url.toString().lowercase()
         val hasNextPage = document.select("#__next > main > div > div[class*=\"Animes_paginate\"] a:last-child svg").any()
         document.select("script").forEach { script ->
             if (script.data().contains("{\"props\":{\"pageProps\":")) {
@@ -68,23 +85,35 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val props = jObject["props"]!!.jsonObject
                 val pageProps = props["pageProps"]!!.jsonObject
                 val data = pageProps["data"]!!.jsonObject
-                val popularToday = data["popular_today"]!!.jsonArray
-                popularToday.forEach { item ->
-                    val animeItem = item!!.jsonObject
-                    val anime = SAnime.create()
-                    anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive!!.content}"))
-                    anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive!!.content}"
-                    anime.title = animeItem["name"]!!.jsonPrimitive!!.content
-                    animeList.add(anime)
+                if (url.contains("status=1")) {
+                    val latestData = data["data"]!!.jsonArray
+                    latestData.forEach { item ->
+                        val animeItem = item!!.jsonObject
+                        val anime = SAnime.create()
+                        anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive!!.content}"))
+                        anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive!!.content}"
+                        anime.title = animeItem["name"]!!.jsonPrimitive!!.content
+                        animeList.add(anime)
+                    }
+                } else {
+                    val popularToday = data["popular_today"]!!.jsonArray
+                    popularToday.forEach { item ->
+                        val animeItem = item!!.jsonObject
+                        val anime = SAnime.create()
+                        anime.setUrlWithoutDomain(externalOrInternalImg("anime/${animeItem["slug"]!!.jsonPrimitive!!.content}"))
+                        anime.thumbnail_url = "https://image.tmdb.org/t/p/w200${animeItem["poster"]!!.jsonPrimitive!!.content}"
+                        anime.title = animeItem["name"]!!.jsonPrimitive!!.content
+                        animeList.add(anime)
+                    }
                 }
             }
         }
         return AnimesPage(animeList, hasNextPage)
     }
 
-    override fun popularAnimeFromElement(element: Element) = throw Exception("not used")
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/animes?page=$page&status=1")
 
-    override fun popularAnimeNextPageSelector(): String = "uwu"
+    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
 
     override fun animeDetailsParse(response: Response): SAnime {
         val document = response.asJsoup()
@@ -107,8 +136,6 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return newAnime
     }
 
-    override fun animeDetailsParse(document: Document) = throw Exception("not used")
-
     override fun episodeListParse(response: Response): List<SEpisode> {
         val document = response.asJsoup()
         val episodeList = mutableListOf<SEpisode>()
@@ -132,12 +159,8 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return episodeList
     }
 
-    override fun episodeListSelector() = "uwu"
-
-    override fun episodeFromElement(element: Element) = throw Exception("not used")
-
     private fun parseJsonArray(json: JsonElement?): List<JsonElement> {
-        var list = mutableListOf<JsonElement>()
+        val list = mutableListOf<JsonElement>()
         json!!.jsonObject!!.entries!!.forEach { list.add(it.value) }
         return list
     }
@@ -175,35 +198,29 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         ).execute()
                         val locationsDdh = request!!.networkResponse.toString()
                         fetchUrls(locationsDdh).map { url ->
-                            val language = if (item["languaje"]!!.jsonPrimitive!!.content == "1") "[Lat] " else "[Sub] "
+                            val language = if (item["languaje"]!!.jsonPrimitive!!.content == "1") "[LAT]" else "[SUB]"
                             val embedUrl = url.lowercase()
                             if (embedUrl.contains("filemoon")) {
-                                FilemoonExtractor(client).videosFromUrl(url, language)
-                                    .also(videoList::addAll)
+                                val vidHeaders = headers.newBuilder()
+                                    .add("Origin", "https://${url.toHttpUrl().host}")
+                                    .add("Referer", "https://${url.toHttpUrl().host}/")
+                                    .build()
+                                FilemoonExtractor(client).videosFromUrl(url, prefix = "$language Filemoon:", headers = vidHeaders).also(videoList::addAll)
+                            }
+                            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
+                                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$language FileLions:$it" }).also(videoList::addAll)
                             }
                             if (embedUrl.contains("streamtape")) {
-                                val video = StreamTapeExtractor(client).videoFromUrl(url, language + "Streamtape")
-                                if (video != null) {
-                                    videoList.add(video)
-                                }
+                                StreamTapeExtractor(client).videoFromUrl(url, "$language Streamtape")?.let { videoList.add(it) }
                             }
                             if (embedUrl.contains("dood")) {
-                                val video = try {
-                                    DoodExtractor(client).videoFromUrl(url, language + "DoodStream")
-                                } catch (e: Exception) {
-                                    null
-                                }
-                                if (video != null) {
-                                    videoList.add(video)
-                                }
+                                DoodExtractor(client).videoFromUrl(url, "$language DoodStream")?.let { videoList.add(it) }
                             }
                             if (embedUrl.contains("okru") || embedUrl.contains("ok.ru")) {
-                                val videos = OkruExtractor(client).videosFromUrl(url, language)
-                                videoList.addAll(videos)
+                                OkruExtractor(client).videosFromUrl(url, language).also(videoList::addAll)
                             }
                             if (embedUrl.contains("solidfiles")) {
-                                val videos = SolidFilesExtractor(client).videosFromUrl(url, language)
-                                videoList.addAll(videos)
+                                SolidFilesExtractor(client).videosFromUrl(url, language).also(videoList::addAll)
                             }
                             if (embedUrl.contains("od.lk")) {
                                 videoList.add(Video(url, language + "Od.lk", url))
@@ -219,31 +236,18 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return videoList
     }
 
-    override fun videoListSelector() = throw Exception("not used")
-
-    override fun videoUrlParse(document: Document) = throw Exception("not used")
-
-    override fun videoFromElement(element: Element) = throw Exception("not used")
-
     override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "[Sub] Okru:720p")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
-    private fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
@@ -268,10 +272,6 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         TypeFilter(),
     )
 
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        return popularAnimeFromElement(element)
-    }
-
     override fun searchAnimeParse(response: Response): AnimesPage {
         val document = response.asJsoup()
         val animeList = mutableListOf<SAnime>()
@@ -296,10 +296,6 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return AnimesPage(animeList, hasNextPage)
     }
 
-    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
-
-    override fun searchAnimeSelector(): String = popularAnimeSelector()
-
     private class GenreFilter : UriPartFilter(
         "Géneros",
         arrayOf(
@@ -390,32 +386,29 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
     }
 
-    override fun latestUpdatesSelector() = popularAnimeSelector()
-
-    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/animes?page=$page&status=1")
-
-    override fun latestUpdatesParse(response: Response) = popularAnimeParse(response)
-
-    override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            summary = "%s"
 
-    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
 
-    override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val options = arrayOf(
-            "[Sub] Okru:1080p", "[Sub] Okru:720p", "[Sub] Okru:480p", "[Sub] Okru:360p", "[Sub] Okru:240p", // Okru [Sub]
-            "[Lat] Okru:1080p", "[Lat] Okru:720p", "[Lat] Okru:480p", "[Lat] Okru:360p", "[Lat] Okru:240p", // Okru [Lat]
-            "[Sub] StreamTape", "[Lat] StreamTape", // video servers without resolution
-            "[Sub] DoodStream", "[Lat] DoodStream", // video servers without resolution
-            "[Sub] SolidFiles", "[Lat] SolidFiles", // video servers without resolution
-            "[Sub] Od.lk", "[Lat] Od.lk", // video servers without resolution
-            "[Sub] CldUp", "[Lat] CldUp",
-        ) // video servers without resolution
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = options
-            entryValues = options
-            setDefaultValue("[Sub] Okru:720p")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -424,7 +417,22 @@ class AnimeLatinoHD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
index 560df41df2..38898e7371 100644
--- a/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
+++ b/src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
@@ -66,7 +66,7 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     companion object {
         const val PREF_QUALITY_KEY = "preferred_quality"
         const val PREF_QUALITY_DEFAULT = "1080"
-        val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
 
         private const val PREF_SERVER_KEY = "preferred_server"
         private const val PREF_SERVER_DEFAULT = "Voe"
@@ -412,11 +412,11 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_SERVER_KEY
-            title = "Preferred server"
-            entries = SERVER_LIST
-            entryValues = SERVER_LIST
-            setDefaultValue(PREF_SERVER_DEFAULT)
+            key = PREF_QUALITY_KEY
+            title = "Preferred quality"
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -428,11 +428,11 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_QUALITY_KEY
-            title = "Preferred quality"
-            entries = QUALITY_LIST
-            entryValues = QUALITY_LIST
-            setDefaultValue(PREF_QUALITY_DEFAULT)
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->

From 21c6c906c51ca352f49a1a9b5c50babb6a6c874f Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sat, 28 Oct 2023 18:03:05 -0600
Subject: [PATCH 05/11] AnimeMovil updated

---
 .../es/animemovil/AnimeMovil.kt               | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
index 54f31bb11e..45d762cea9 100644
--- a/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
+++ b/src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
@@ -68,8 +68,8 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
         private val SERVER_LIST = arrayOf(
             "PlusTube", "PlusVid", "PlusIm", "PlusWish", "PlusHub", "PlusDex",
             "YourUpload", "Voe", "StreamWish", "Mp4Upload", "Doodstream",
-            "Upload", "BurstCloud", "Upstream", "StreamTape", "PlusFilm",
-            "Fastream",
+            "Uqload", "BurstCloud", "Upstream", "StreamTape", "PlusFilm",
+            "Fastream", "FileLions"
         )
     }
 
@@ -276,6 +276,9 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
             if (embedUrl.contains("streamtape")) {
                 StreamTapeExtractor(client).videoFromUrl(url)?.also(videoList::add)
             }
+            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
+                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" }).also(videoList::addAll)
+            }
         } catch (_: Exception) {}
         return videoList
     }
@@ -406,11 +409,11 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         ListPreference(screen.context).apply {
-            key = PREF_SERVER_KEY
-            title = "Preferred server"
-            entries = SERVER_LIST
-            entryValues = SERVER_LIST
-            setDefaultValue(PREF_SERVER_DEFAULT)
+            key = PREF_QUALITY_KEY
+            title = "Preferred quality"
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -422,11 +425,11 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_QUALITY_KEY
-            title = "Preferred quality"
-            entries = QUALITY_LIST
-            entryValues = QUALITY_LIST
-            setDefaultValue(PREF_QUALITY_DEFAULT)
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->

From 93261a6c1844efbffb7cefe85249d4a9b3b7ce67 Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sat, 28 Oct 2023 18:38:03 -0600
Subject: [PATCH 06/11] AnimeYT updated

---
 .../animeextension/es/animeyt/Animeyt.kt      | 83 +++++++++++--------
 1 file changed, 50 insertions(+), 33 deletions(-)

diff --git a/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt b/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt
index 328b9205c4..aeaf97a2f2 100644
--- a/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt
+++ b/src/es/animeyt/src/eu/kanade/tachiyomi/animeextension/es/animeyt/Animeyt.kt
@@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -21,12 +20,11 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
 import java.lang.Exception
 
 class Animeyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
-    override val name = "Animeyt"
+    override val name = "AnimeYT"
 
     override val baseUrl = "https://ytanime.tv"
 
@@ -36,15 +34,23 @@ class Animeyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val client: OkHttpClient = network.cloudflareClient
 
-    private val json: Json by injectLazy()
-
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Fastream"
+        private val SERVER_LIST = arrayOf("Fastream")
+    }
+
     override fun popularAnimeSelector(): String = "div.video-block div.row div.col-md-2 div.video-card"
 
-    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/ultimos-animes?page=$page")
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/mas-populares?page=$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
@@ -83,8 +89,13 @@ class Animeyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 .split(".")[0]
                 .replace("https://", "")
                 .replace("http://", "")
-            val url = container.attr("src")
+
+            var url = container.attr("src")
             if (server == "fastream") {
+                if (url.contains("emb.html")) {
+                    val key = url.split("/").last()
+                    url = "https://fastream.to/embed-$key.html"
+                }
                 FastreamExtractor(client).videoFromUrl(url).forEach { videoList.add(it) }
             }
         }
@@ -98,24 +109,15 @@ class Animeyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
     override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "Fastream:720p")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
-    private fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/search?q=$query&page=$page")
@@ -150,17 +152,17 @@ class Animeyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
 
-    override fun latestUpdatesRequest(page: Int) = popularAnimeRequest(page)
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/ultimos-animes?page=$page")
 
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = arrayOf("Fastream:720p", "Fastream:480p", "Fastream:360p")
-            entryValues = arrayOf("Fastream:720p", "Fastream:480p", "Fastream:360p")
-            setDefaultValue("Fastream:720p")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -169,7 +171,22 @@ class Animeyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }

From 6d7aa5223ab48f666f6253c5ce14f49eb798b37c Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sat, 28 Oct 2023 20:01:26 -0600
Subject: [PATCH 07/11] AsiaLiveAction updated

---
 src/es/asialiveaction/build.gradle            |  16 ++
 .../es/asialiveaction/AsiaLiveAction.kt       | 238 ++++++++++++++----
 .../extractors/VidGuardExtractor.kt           | 124 +++++++++
 .../es/pelisplushd/Pelisplushd.kt             |   3 +
 4 files changed, 328 insertions(+), 53 deletions(-)
 create mode 100644 src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/VidGuardExtractor.kt

diff --git a/src/es/asialiveaction/build.gradle b/src/es/asialiveaction/build.gradle
index fbb978bc4f..be11ba74f3 100644
--- a/src/es/asialiveaction/build.gradle
+++ b/src/es/asialiveaction/build.gradle
@@ -10,7 +10,23 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-vudeo-extractor'))
+    implementation(project(':lib-uqload-extractor'))
+    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib-yourupload-extractor'))
+    implementation(project(':lib-streamtape-extractor'))
+    implementation(project(':lib-dood-extractor'))
+    implementation(project(':lib-voe-extractor'))
     implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib-burstcloud-extractor'))
+    implementation(project(':lib-fastream-extractor'))
+    implementation(project(':lib-upstream-extractor'))
+    implementation(project(':lib-streamhidevid-extractor'))
+    implementation(project(':lib-vk-extractor'))
 }
 
 
diff --git a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
index 8a7f79d1e5..fc3e86e862 100644
--- a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
+++ b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.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.es.asialiveaction.extractors.VidGuardExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -11,9 +12,24 @@ 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.lib.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
+import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
+import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.json.Json
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -21,7 +37,7 @@ 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
+import uy.kohesive.injekt.injectLazy
 import java.util.Calendar
 
 class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
@@ -36,10 +52,28 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val client: OkHttpClient = network.cloudflareClient
 
+    private val json: Json by injectLazy()
+
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "FileLions"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape",
+            "Fastream", "Filemoon", "StreamWish", "VidGuard",
+            "Amazon", "AmazonES", "Fireload", "FileLions",
+            "vk.com",
+        )
+    }
+
     override fun popularAnimeSelector(): String = "div.TpRwCont main section ul.MovieList li.TPostMv article.TPost"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/todos/page/$page")
@@ -58,7 +92,7 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val anime = SAnime.create()
         anime.thumbnail_url = document.selectFirst("header div.Image figure img")!!.attr("src").trim().replace("//", "https://")
         anime.title = document.selectFirst("header div.asia-post-header h1.Title")!!.text()
-        anime.description = document.selectFirst("header div.asia-post-main div.Description p:nth-child(2)")!!.text().removeSurrounding("\"")
+        anime.description = document.selectFirst("header div.asia-post-main div.Description p:nth-child(2), header div.asia-post-main div.Description p")!!.text().removeSurrounding("\"")
         anime.genre = document.select("div.asia-post-main p.Info span.tags a").joinToString { it.text() }
         val year = document.select("header div.asia-post-main p.Info span.Date a").text().toInt()
         val currentYear = Calendar.getInstance().get(Calendar.YEAR)
@@ -74,41 +108,140 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return super.episodeListParse(response).reversed()
     }
 
-    override fun episodeListSelector() = "#ep-list div.TPTblCn span a"
+    override fun episodeListSelector() = "#ep-list div.TPTblCn span a, #ep-list div.TPTblCn .accordion"
 
     override fun episodeFromElement(element: Element): SEpisode {
-        val episode = SEpisode.create()
-        val epNum = getNumberFromEpsString(element.select("div.flex-grow-1 p").text())
-        episode.setUrlWithoutDomain(element.attr("href"))
-        episode.episode_number = when {
-            epNum.isNotEmpty() -> epNum.toFloatOrNull() ?: 1F
-            else -> 1F
+        return if (element.attr("class").contains("accordion")) {
+            val epNum = getNumberFromEpsString(element.select("label span").text())
+            SEpisode.create().apply {
+                name = element.select("label span").text().trim()
+                episode_number = when {
+                    epNum.isNotEmpty() -> epNum.toFloatOrNull() ?: 1F
+                    else -> 1F
+                }
+                setUrlWithoutDomain(element.selectFirst("ul li a")?.attr("abs:href")!!)
+            }
+        } else {
+            val epNum = getNumberFromEpsString(element.select("div.flex-grow-1 p").text())
+            SEpisode.create().apply {
+                setUrlWithoutDomain(element.attr("abs:href"))
+                episode_number = when {
+                    epNum.isNotEmpty() -> epNum.toFloatOrNull() ?: 1F
+                    else -> 1F
+                }
+                name = element.select("div.flex-grow-1 p").text().trim()
+            }
         }
-        episode.name = element.select("div.flex-grow-1 p").text().trim()
-        return episode
     }
 
     private fun getNumberFromEpsString(epsStr: String): String {
         return epsStr.filter { it.isDigit() }
     }
 
+    private fun fetchUrls(text: String?): List<String> {
+        if (text.isNullOrEmpty()) return listOf()
+        val linkRegex = "(http|ftp|https):\\/\\/([\\w_-]+(?:(?:\\.[\\w_-]+)+))([\\w.,@?^=%&:\\/~+#-]*[\\w@?^=%&\\/~+#-])".toRegex()
+        return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
+    }
+
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val videoList = mutableListOf<Video>()
-        document.select("script").forEach { script ->
-            if (script.data().contains("var videosJap = [") || script.data().contains("var videosCor = [")) {
-                val content = script.data()
-
-                if (content.contains("okru")) {
-                    val url = content.substringAfter(",['OK','").substringBefore("',0,0]")
-                    val videos = OkruExtractor(client).videosFromUrl(url)
-                    videoList.addAll(videos)
-                }
+        document.select("script:containsData(var videos)").forEach { script ->
+            fetchUrls(script.data()).map { url ->
+                try {
+                    serverVideoResolver(url).also(videoList::addAll)
+                } catch (_: Exception) {}
             }
         }
         return videoList
     }
 
+    private fun serverVideoResolver(url: String): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val embedUrl = url.lowercase()
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val body = client.newCall(GET(url)).execute().asJsoup()
+                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                        .substringAfter("shareId = \"").substringBefore("\"")
+                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                        .execute().asJsoup()
+                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                    val amazonApi =
+                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                            .execute().asJsoup()
+                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                    videoList.add(Video(videoUrl, "Amazon", videoUrl))
+                }
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
+                    .build()
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") ||
+                embedUrl.contains("streamwish") ||
+                embedUrl.contains("strwish") ||
+                embedUrl.contains("wish") ||
+                embedUrl.contains("sfastwish")
+            ) {
+                val docHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                DoodExtractor(client).videoFromUrl(url2, "DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url).forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide") || embedUrl.contains("hide")) {
+                StreamHideVidExtractor(client).videosFromUrl(url).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("filelions") || embedUrl.contains("lion") || embedUrl.contains("fviplions")) {
+                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("vembed") || embedUrl.contains("guard")) {
+                VidGuardExtractor(client).videosFromUrl(url).also(videoList::addAll)
+            }
+            if (embedUrl.contains("vk")) {
+                VkExtractor(client, headers).videosFromUrl(url).also(videoList::addAll)
+            }
+        } catch (_: Exception) { }
+        return videoList
+    }
+
     override fun videoListSelector() = throw Exception("not used")
 
     override fun videoUrlParse(document: Document) = throw Exception("not used")
@@ -116,24 +249,15 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
     override fun List<Video>.sort(): List<Video> {
-        return try {
-            val videoSorted = this.sortedWith(
-                compareBy<Video> { it.quality.replace("[0-9]".toRegex(), "") }.thenByDescending { getNumberFromString(it.quality) },
-            ).toTypedArray()
-            val userPreferredQuality = preferences.getString("preferred_quality", "Okru:1080p")
-            val preferredIdx = videoSorted.indexOfFirst { x -> x.quality == userPreferredQuality }
-            if (preferredIdx != -1) {
-                videoSorted.drop(preferredIdx + 1)
-                videoSorted[0] = videoSorted[preferredIdx]
-            }
-            videoSorted.toList()
-        } catch (e: Exception) {
-            this
-        }
-    }
-
-    private fun getNumberFromString(epsStr: String): String {
-        return epsStr.filter { it.isDigit() }.ifEmpty { "0" }
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
@@ -201,19 +325,12 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun latestUpdatesSelector() = popularAnimeSelector()
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Okru:1080p",
-            "Okru:720p",
-            "Okru:480p",
-            "Okru:360p",
-            "Okru:240p", // Okru
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Okru:1080p")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -222,7 +339,22 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }
diff --git a/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/VidGuardExtractor.kt b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/VidGuardExtractor.kt
new file mode 100644
index 0000000000..bb6d5e83a2
--- /dev/null
+++ b/src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/extractors/VidGuardExtractor.kt
@@ -0,0 +1,124 @@
+package eu.kanade.tachiyomi.animeextension.es.asialiveaction.extractors
+
+import android.app.Application
+import android.os.Handler
+import android.os.Looper
+import android.util.Base64
+import android.webkit.JavascriptInterface
+import android.webkit.WebSettings
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import uy.kohesive.injekt.injectLazy
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class VidGuardExtractor(private val client: OkHttpClient) {
+    private val context: Application by injectLazy()
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+
+    class JsObject(private val latch: CountDownLatch) {
+        var payload: String = ""
+
+        @JavascriptInterface
+        fun passPayload(passedPayload: String) {
+            payload = passedPayload
+            latch.countDown()
+        }
+    }
+
+    fun videosFromUrl(url: String): List<Video> {
+        val doc = client.newCall(GET(url)).execute().use { it.asJsoup() }
+        val scriptUrl = doc.selectFirst("script[src*=ad/plugin]")
+            ?.absUrl("src")
+            ?: return emptyList()
+
+        val headers = Headers.headersOf("Referer", url)
+        val script = client.newCall(GET(scriptUrl, headers)).execute()
+            .use { it.body.string() }
+
+        val sources = getSourcesFromScript(script, url)
+            .takeIf { it.isNotBlank() && it != "undefined" }
+            ?: return emptyList()
+
+        return sources.substringAfter("stream:[").substringBefore("}]")
+            .split('{')
+            .drop(1)
+            .mapNotNull { line ->
+                val resolution = line.substringAfter("Label\":\"").substringBefore('"')
+                val videoUrl = line.substringAfter("URL\":\"").substringBefore('"')
+                    .takeIf(String::isNotBlank)
+                    ?.let(::fixUrl)
+                    ?: return@mapNotNull null
+                Video(videoUrl, "VidGuard:$resolution", videoUrl, headers)
+            }
+    }
+
+    private fun getSourcesFromScript(script: String, url: String): String {
+        val latch = CountDownLatch(1)
+
+        var webView: WebView? = null
+
+        val jsinterface = JsObject(latch)
+
+        handler.post {
+            val webview = WebView(context)
+            webView = webview
+            with(webview.settings) {
+                javaScriptEnabled = true
+                domStorageEnabled = true
+                databaseEnabled = true
+                useWideViewPort = false
+                loadWithOverviewMode = false
+                cacheMode = WebSettings.LOAD_NO_CACHE
+            }
+
+            webview.addJavascriptInterface(jsinterface, "android")
+            webview.webViewClient = object : WebViewClient() {
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    view?.clearCache(true)
+                    view?.clearFormData()
+                    view?.evaluateJavascript(script) {}
+                    view?.evaluateJavascript("window.android.passPayload(JSON.stringify(window.svg))") {}
+                }
+            }
+
+            webview.loadDataWithBaseURL(url, "<html></html>", "text/html", "UTF-8", null)
+        }
+
+        latch.await(5, TimeUnit.SECONDS)
+
+        handler.post {
+            webView?.stopLoading()
+            webView?.destroy()
+            webView = null
+        }
+
+        return jsinterface.payload
+    }
+
+    private fun fixUrl(url: String): String {
+        val httpUrl = url.toHttpUrl()
+        val originalSign = httpUrl.queryParameter("sig")!!
+        val newSign = originalSign.chunked(2).joinToString("") {
+            Char(it.toInt(16) xor 2).toString()
+        }
+            .let { String(Base64.decode(it, Base64.DEFAULT)) }
+            .substring(5)
+            .chunked(2)
+            .reversed()
+            .joinToString("")
+            .substring(5)
+
+        return httpUrl.newBuilder()
+            .removeAllQueryParameters("sig")
+            .addQueryParameter("sig", newSign)
+            .build()
+            .toString()
+    }
+}
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
index 40749cad55..3a2ff6ed9d 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
@@ -239,6 +239,9 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
             if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
                 StreamHideExtractor(client).videosFromUrl(url, "StreamHide").let { videoList.addAll(it) }
             }
+            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
+                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "FileLions:$it" }).also(videoList::addAll)
+            }
             if (embedUrl.contains("tomatomatela")) {
                 runCatching {
                     val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")

From d9b0a014ecd94bca23f6a209ea61cfc85f89cb2c Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sun, 29 Oct 2023 20:21:44 -0600
Subject: [PATCH 08/11] Cuevana updated

---
 .../animeextension/es/cuevana/CuevanaCh.kt    |  23 ++--
 .../animeextension/es/cuevana/CuevanaEu.kt    | 111 ++++++++++++------
 2 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
index fc133397bc..d396b47c86 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
@@ -251,6 +251,9 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
                     if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
                 }
             }
+            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
+                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" }).also(videoList::addAll)
+            }
         } catch (_: Exception) { }
         return videoList
     }
@@ -348,11 +351,11 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         ListPreference(screen.context).apply {
-            key = PREF_SERVER_KEY
-            title = "Preferred server"
-            entries = SERVER_LIST
-            entryValues = SERVER_LIST
-            setDefaultValue(PREF_SERVER_DEFAULT)
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -380,11 +383,11 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_LANGUAGE_KEY
-            title = "Preferred language"
-            entries = LANGUAGE_LIST
-            entryValues = LANGUAGE_LIST
-            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
diff --git a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
index 160eeda3d5..e400ccf65b 100644
--- a/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
+++ b/src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
@@ -46,9 +46,7 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
 
     override val supportsLatest = false
 
-    private val json = Json {
-        ignoreUnknownKeys = true
-    }
+    private val json = Json { ignoreUnknownKeys = true }
 
     override val client: OkHttpClient = network.cloudflareClient
 
@@ -56,6 +54,24 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    companion object {
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf("[LAT]", "[ENG]", "[CAST]", "[JAP]")
+
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "Tomatomatela", "YourUpload", "Doodstream", "Okru",
+            "Voe", "StreamTape", "StreamWish", "Filemoon",
+            "FileLions",
+        )
+    }
+
     override fun popularAnimeSelector(): String = ".MovieList .TPostMv .TPost"
 
     override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/peliculas/estrenos/page/$page")
@@ -72,7 +88,7 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
         responseJson.props?.pageProps?.movies?.map { animeItem ->
             val anime = SAnime.create()
             val preSlug = animeItem.url?.slug ?: ""
-            val type = if (preSlug.startsWith("series")) "serie" else "pelicula"
+            val type = if (preSlug.startsWith("series")) "ver-serie" else "ver-pelicula"
 
             anime.title = animeItem.titles?.name ?: ""
             anime.thumbnail_url = animeItem.images?.poster?.replace("/original/", "/w200/") ?: ""
@@ -89,7 +105,7 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
     override fun episodeListParse(response: Response): List<SEpisode> {
         val episodes = mutableListOf<SEpisode>()
         val document = response.asJsoup()
-        if (response.request.url.toString().contains("/serie/")) {
+        if (response.request.url.toString().contains("/ver-serie/")) {
             val script = document.selectFirst("script:containsData({\"props\":{\"pageProps\":{)")!!.data()
             val responseJson = json.decodeFromString<AnimeEpisodesList>(script)
             responseJson.props?.pageProps?.thisSerie?.seasons?.map {
@@ -215,7 +231,7 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
             OkruExtractor(client).videosFromUrl(url, prefix, true).also(videoList::addAll)
         }
         if (embedUrl.contains("voe")) {
-            VoeExtractor(client).videoFromUrl(url, "$prefix Voex")?.let { videoList.add(it) }
+            VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
         }
         if (embedUrl.contains("streamtape")) {
             StreamTapeExtractor(client).videoFromUrl(url, "$prefix StreamTape")?.let { videoList.add(it) }
@@ -227,6 +243,9 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
         if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
             FilemoonExtractor(client).videosFromUrl(url, "$prefix Filemoon:").also(videoList::addAll)
         }
+        if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
+            StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" }).also(videoList::addAll)
+        }
         return videoList
     }
 
@@ -237,21 +256,17 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
     override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "Voex")
-        if (quality != null) {
-            val newList = mutableListOf<Video>()
-            var preferred = 0
-            for (video in this) {
-                if (video.quality == quality) {
-                    newList.add(preferred, video)
-                    preferred++
-                } else {
-                    newList.add(video)
-                }
-            }
-            return newList
-        }
-        return this
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
@@ -280,13 +295,14 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
         val newAnime = SAnime.create()
         val script = document.selectFirst("script:containsData({\"props\":{\"pageProps\":{)")!!.data()
         val responseJson = json.decodeFromString<AnimeEpisodesList>(script)
-        if (response.request.url.toString().contains("/serie/")) {
+        if (response.request.url.toString().contains("/ver-serie/")) {
             val data = responseJson.props?.pageProps?.thisSerie
             newAnime.status = SAnime.UNKNOWN
             newAnime.title = data?.titles?.name ?: ""
             newAnime.description = data?.overview ?: ""
             newAnime.thumbnail_url = data?.images?.poster?.replace("/original/", "/w500/")
             newAnime.genre = data?.genres?.joinToString { it.name ?: "" }
+            newAnime.artist = data?.cast?.acting?.firstOrNull()?.name ?: ""
             newAnime.setUrlWithoutDomain(response.request.url.toString())
         } else {
             val data = responseJson.props?.pageProps?.thisMovie
@@ -295,6 +311,7 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
             newAnime.description = data?.overview ?: ""
             newAnime.thumbnail_url = data?.images?.poster?.replace("/original/", "/w500/")
             newAnime.genre = data?.genres?.joinToString { it.name ?: "" }
+            newAnime.artist = data?.cast?.acting?.firstOrNull()?.name ?: ""
             newAnime.setUrlWithoutDomain(response.request.url.toString())
         }
 
@@ -342,17 +359,28 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Streamlare:1080p", "Streamlare:720p", "Streamlare:480p", "Streamlare:360p", "Streamlare:240p", // Streamlare}
-            "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", // Okru
-            "StreamTape", "Amazon", "Voex", "DoodStream", "YourUpload", "Filemoon", "StreamWish", "Tomatomatela", "YourUpload",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Voex")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -361,7 +389,22 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }

From 180c65d9c126c0baab76b6ed1df5198886d9be8f Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sun, 29 Oct 2023 23:03:42 -0600
Subject: [PATCH 09/11] DoramasFlix updated

---
 src/es/doramasflix/build.gradle               |  14 +-
 .../es/doramasflix/Doramasflix.kt             | 286 ++++++++++++++----
 2 files changed, 243 insertions(+), 57 deletions(-)

diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index b0c5790f4c..5657850b5d 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -10,12 +10,22 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-vudeo-extractor'))
     implementation(project(':lib-uqload-extractor'))
-    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib-streamwish-extractor'))
+    implementation(project(':lib-filemoon-extractor'))
+    implementation(project(':lib-streamlare-extractor'))
+    implementation(project(':lib-yourupload-extractor'))
     implementation(project(':lib-streamtape-extractor'))
-    implementation(project(':lib-okru-extractor'))
     implementation(project(':lib-dood-extractor'))
     implementation(project(':lib-voe-extractor'))
+    implementation(project(':lib-okru-extractor'))
+    implementation(project(':lib-mp4upload-extractor'))
+    implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib-burstcloud-extractor'))
+    implementation(project(':lib-fastream-extractor'))
+    implementation(project(':lib-upstream-extractor'))
+    implementation(project(':lib-streamhidevid-extractor'))
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
index 6818feda51..9bd5935627 100644
--- a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
+++ b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
@@ -11,11 +11,20 @@ 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.AnimeHttpSource
-import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
+import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.fastreamextractor.FastreamExtractor
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
+import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
+import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
@@ -26,6 +35,7 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -55,6 +65,29 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val json: Json by injectLazy()
 
+    companion object {
+        private const val PREF_LANGUAGE_KEY = "preferred_language"
+        private const val PREF_LANGUAGE_DEFAULT = "[LAT]"
+        private val LANGUAGE_LIST = arrayOf(
+            "[ENG]", "[CAST]", "[LAT]", "[SUB]", "[POR]",
+            "[COR]", "[JAP]", "[MAN]", "[TAI]", "[FIL]",
+            "[IND]", "[VIET]",
+        )
+
+        private const val PREF_QUALITY_KEY = "preferred_quality"
+        private const val PREF_QUALITY_DEFAULT = "1080"
+        private val QUALITY_LIST = arrayOf("1080", "720", "480", "360")
+
+        private const val PREF_SERVER_KEY = "preferred_server"
+        private const val PREF_SERVER_DEFAULT = "Voe"
+        private val SERVER_LIST = arrayOf(
+            "YourUpload", "BurstCloud", "Voe", "Mp4Upload", "Doodstream",
+            "Upload", "BurstCloud", "Upstream", "StreamTape", "Amazon",
+            "Fastream", "Filemoon", "StreamWish", "Okru", "Streamlare",
+            "Uqload",
+        )
+    }
+
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -89,21 +122,21 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
             if (el.data().contains("{\"props\":{\"pageProps\":{")) {
                 val apolloState = json.decodeFromString<JsonObject>(el.data())!!.jsonObject["props"]!!.jsonObject["pageProps"]!!.jsonObject["apolloState"]!!.jsonObject
                 val dorama = apolloState!!.entries!!.firstOrNull()!!.value!!.jsonObject
-                val genres = try { apolloState.entries.filter { x -> x.key.contains("genres") }.joinToString { it.value.jsonObject["name"]!!.jsonPrimitive.content } } catch (_: Exception) { null }
-                val network = try { apolloState.entries.firstOrNull { x -> x.key.contains("networks") }?.value?.jsonObject?.get("name")!!.jsonPrimitive.content } catch (_: Exception) { null }
-                val artist = try { dorama["cast"]?.jsonObject?.get("json")?.jsonArray?.firstOrNull()?.jsonObject?.get("name")?.jsonPrimitive?.content } catch (_: Exception) { null }
-                val type = dorama["__typename"]!!.jsonPrimitive.content.lowercase()
-                val poster = dorama["poster_path"]!!.jsonPrimitive.content
-                val urlImg = poster.ifEmpty { dorama["poster"]!!.jsonPrimitive.content }
-
-                val id = dorama["_id"]!!.jsonPrimitive!!.content
-                anime.title = "${dorama["name"]!!.jsonPrimitive!!.content} (${dorama["name_es"]!!.jsonPrimitive!!.content})"
-                anime.description = dorama["overview"]!!.jsonPrimitive!!.content.trim()
-                anime.genre = genres
-                anime.author = network
-                anime.artist = artist
-                anime.status = if (type == "movie") SAnime.COMPLETED else SAnime.UNKNOWN
-                anime.thumbnail_url = externalOrInternalImg(urlImg)
+                val genres = try { apolloState.entries.filter { x -> x.key.contains("genres") }.joinToString { it.value.jsonObject["name"]!!.jsonPrimitive.content } } catch (_: Exception) { "" }
+                val network = try { apolloState.entries.firstOrNull { x -> x.key.contains("networks") }?.value?.jsonObject?.get("name")!!.jsonPrimitive.content } catch (_: Exception) { "" }
+                val artist = try { dorama["cast"]?.jsonObject?.get("json")?.jsonArray?.firstOrNull()?.jsonObject?.get("name")?.jsonPrimitive?.content } catch (_: Exception) { "" }
+                val type = try { dorama["__typename"]!!.jsonPrimitive.content.lowercase() } catch (_: Exception) { "" }
+                val poster = try { dorama["poster_path"]!!.jsonPrimitive.content } catch (_: Exception) { "" }
+                val urlImg = try { poster.ifEmpty { dorama["poster"]!!.jsonPrimitive.content } } catch (_: Exception) { "" }
+
+                val id = dorama["_id"]!!.jsonPrimitive.content
+                anime.title = "${dorama["name"]?.jsonPrimitive?.content} (${dorama["name_es"]?.jsonPrimitive?.content})"
+                anime.description = dorama["overview"]?.jsonPrimitive?.content?.trim() ?: ""
+                if (genres.isNotEmpty()) anime.genre = genres
+                if (network.isNotEmpty()) anime.author = network
+                if (artist != null) anime.artist = artist
+                if (type.isNotEmpty()) anime.status = if (type == "movie") SAnime.COMPLETED else SAnime.UNKNOWN
+                if (urlImg.isNotEmpty()) anime.thumbnail_url = externalOrInternalImg(urlImg)
                 anime.setUrlWithoutDomain(urlSolverByType(dorama["__typename"]!!.jsonPrimitive!!.content, dorama["slug"]!!.jsonPrimitive!!.content, id))
             }
         }
@@ -196,6 +229,25 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
         return parsePopularAnimeJson(responseString)
     }
 
+    private val languages = arrayOf(
+        Pair("36", "[ENG]"),
+        Pair("37", "[CAST]"),
+        Pair("38", "[LAT]"),
+        Pair("192", "[SUB]"),
+        Pair("1327", "[POR]"),
+        Pair("13109", "[COR]"),
+        Pair("13110", "[JAP]"),
+        Pair("13111", "[MAN]"),
+        Pair("13112", "[TAI]"),
+        Pair("13113", "[FIL]"),
+        Pair("13114", "[IND]"),
+        Pair("343422", "[VIET]"),
+    )
+
+    private fun String.getLang(): String {
+        return languages.firstOrNull { it.first == this }?.second ?: ""
+    }
+
     private fun parsePopularAnimeJson(jsonLine: String?): AnimesPage {
         val jsonData = jsonLine ?: return AnimesPage(emptyList(), false)
         val animeList = mutableListOf<SAnime>()
@@ -212,7 +264,6 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
             anime.description = it.jsonObject!!["overview"]!!.jsonPrimitive!!.content
             anime.genre = genres
             anime.thumbnail_url = externalOrInternalImg(urlImg, true)
-            // "https://image.tmdb.org/t/p/w220_and_h330_face${it.jsonObject!!["poster_path"]!!.jsonPrimitive!!.content}"
             anime.setUrlWithoutDomain(urlSolverByType(it.jsonObject!!["__typename"]!!.jsonPrimitive!!.content, it.jsonObject!!["slug"]!!.jsonPrimitive!!.content, id))
             animeList.add(anime)
         }
@@ -299,52 +350,162 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
         return POST(apiUrl, popularRequestHeaders, body)
     }
 
-    private fun fetchUrls(text: String?): List<String> {
-        if (text.isNullOrEmpty()) return listOf()
-        val linkRegex = "(https?://(www\\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))".toRegex()
-        return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
-    }
-
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
-        val videos = mutableListOf<Video>()
-        val script = document.selectFirst("script:containsData({\"props\":{\"pageProps\":{)")!!.data()
-        fetchUrls(script).map { link ->
-            resolveVideoServer(link).let { videos.addAll(it) }
+        val videoList = mutableListOf<Video>()
+        val jsonData = document.selectFirst("script:containsData({\"props\":{\"pageProps\":{)")!!.data()
+        val apolloState = json.decodeFromString<JsonObject>(jsonData).jsonObject["props"]!!.jsonObject["pageProps"]!!.jsonObject["apolloState"]!!.jsonObject
+        val episode = apolloState.entries.firstOrNull { x -> x.key.contains("Episode:") }!!.value.jsonObject
+
+        val linksOnline = episode["links_online"]!!.jsonObject["json"]!!.jsonArray
+
+        linksOnline.map {
+            val link = it.jsonObject["link"]!!.jsonPrimitive.content
+            val lang = it.jsonObject["lang"]?.jsonPrimitive?.content?.getLang() ?: ""
+            serverVideoResolver(link, lang).also(videoList::addAll)
         }
-        return videos
+        return videoList
     }
 
-    private fun resolveVideoServer(link: String): List<Video> {
-        return runCatching {
-            when {
-                "streamtape" in link ->
-                    StreamTapeExtractor(client).videoFromUrl(link)?.let(::listOf)
-                "mixdrop" in link ->
-                    MixDropExtractor(client).videoFromUrl(link)
-                "uqload.co" in link ->
-                    UqloadExtractor(client).videosFromUrl(link)
-                "ok.ru" in link ->
-                    OkruExtractor(client).videosFromUrl(link)
-                "voe" in link ->
-                    VoeExtractor(client).videoFromUrl(link, "Voex")?.let(::listOf)
-                else -> null
+    private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
+        val videoList = mutableListOf<Video>()
+        val embedUrl = url.lowercase()
+        try {
+            if (embedUrl.contains("voe")) {
+                VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) }
+            }
+            if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
+                val body = client.newCall(GET(url)).execute().asJsoup()
+                if (body.select("script:containsData(var shareId)").toString().isNotBlank()) {
+                    val shareId = body.selectFirst("script:containsData(var shareId)")!!.data()
+                        .substringAfter("shareId = \"").substringBefore("\"")
+                    val amazonApiJson = client.newCall(GET("https://www.amazon.com/drive/v1/shares/$shareId?resourceVersion=V2&ContentType=JSON&asset=ALL"))
+                        .execute().asJsoup()
+                    val epId = amazonApiJson.toString().substringAfter("\"id\":\"").substringBefore("\"")
+                    val amazonApi =
+                        client.newCall(GET("https://www.amazon.com/drive/v1/nodes/$epId/children?resourceVersion=V2&ContentType=JSON&limit=200&sort=%5B%22kind+DESC%22%2C+%22modifiedDate+DESC%22%5D&asset=ALL&tempLink=true&shareId=$shareId"))
+                            .execute().asJsoup()
+                    val videoUrl = amazonApi.toString().substringAfter("\"FOLDER\":").substringAfter("tempLink\":\"").substringBefore("\"")
+                    videoList.add(Video(videoUrl, "$prefix Amazon", videoUrl))
+                }
+            }
+            if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
+                OkruExtractor(client).videosFromUrl(url, prefix = "$prefix ").also(videoList::addAll)
+            }
+            if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
+                val vidHeaders = headers.newBuilder()
+                    .add("Origin", "https://${url.toHttpUrl().host}")
+                    .add("Referer", "https://${url.toHttpUrl().host}/")
+                    .build()
+                FilemoonExtractor(client).videosFromUrl(url, prefix = "$prefix Filemoon:", headers = vidHeaders).also(videoList::addAll)
+            }
+            if (embedUrl.contains("uqload")) {
+                UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
+            }
+            if (embedUrl.contains("mp4upload")) {
+                Mp4uploadExtractor(client).videosFromUrl(url, prefix = "$prefix ", headers = headers).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") || embedUrl.contains("strwish") || embedUrl.contains("wish")) {
+                val docHeaders = headers.newBuilder()
+                    .add("Origin", "https://streamwish.to")
+                    .add("Referer", "https://streamwish.to/")
+                    .build()
+                StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "$prefix StreamWish:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
+                val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
+                DoodExtractor(client).videoFromUrl(url2, "$prefix DoodStream", false)?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("streamlare")) {
+                StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("yourupload") || embedUrl.contains("upload")) {
+                YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = "$prefix ").let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
+                BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = "$prefix ").let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("fastream")) {
+                FastreamExtractor(client).videoFromUrl(url, prefix = "$prefix Fastream:").forEach { videoList.add(it) }
+            }
+            if (embedUrl.contains("upstream")) {
+                UpstreamExtractor(client).videosFromUrl(url, prefix = "$prefix ").let { videoList.addAll(it) }
             }
-        }.getOrNull() ?: emptyList()
+            if (embedUrl.contains("streamtape") || embedUrl.contains("stp") || embedUrl.contains("stape")) {
+                StreamTapeExtractor(client).videoFromUrl(url, quality = "$prefix StreamTape")?.let { videoList.add(it) }
+            }
+            if (embedUrl.contains("ahvsh") || embedUrl.contains("streamhide")) {
+                StreamHideVidExtractor(client).videosFromUrl(url, "$prefix ").let { videoList.addAll(it) }
+            }
+            if (embedUrl.contains("filelions") || embedUrl.contains("lion")) {
+                StreamWishExtractor(client, headers).videosFromUrl(url, videoNameGen = { "$prefix FileLions:$it" }).also(videoList::addAll)
+            }
+            if (embedUrl.contains("tomatomatela")) {
+                runCatching {
+                    val mainUrl = url.substringBefore("/embed.html#").substringAfter("https://")
+                    val headers = headers.newBuilder()
+                        .set("authority", mainUrl)
+                        .set("accept", "application/json, text/javascript, */*; q=0.01")
+                        .set("accept-language", "es-MX,es-419;q=0.9,es;q=0.8,en;q=0.7")
+                        .set("sec-ch-ua", "\"Chromium\";v=\"106\", \"Google Chrome\";v=\"106\", \"Not;A=Brand\";v=\"99\"")
+                        .set("sec-ch-ua-mobile", "?0")
+                        .set("sec-ch-ua-platform", "Windows")
+                        .set("sec-fetch-dest", "empty")
+                        .set("sec-fetch-mode", "cors")
+                        .set("sec-fetch-site", "same-origin")
+                        .set("x-requested-with", "XMLHttpRequest")
+                        .build()
+                    val token = url.substringAfter("/embed.html#")
+                    val urlRequest = "https://$mainUrl/details.php?v=$token"
+                    val response = client.newCall(GET(urlRequest, headers = headers)).execute().asJsoup()
+                    val bodyText = response.select("body").text()
+                    val json = json.decodeFromString<JsonObject>(bodyText)
+                    val status = json["status"]!!.jsonPrimitive!!.content
+                    val file = json["file"]!!.jsonPrimitive!!.content
+                    if (status == "200") { videoList.add(Video(file, "$prefix Tomatomatela", file, headers = null)) }
+                }
+            }
+        } catch (_: Exception) { }
+        return videoList
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString(PREF_QUALITY_KEY, PREF_QUALITY_DEFAULT)!!
+        val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
+        val lang = preferences.getString(PREF_LANGUAGE_KEY, PREF_LANGUAGE_DEFAULT)!!
+        return this.sortedWith(
+            compareBy(
+                { it.quality.contains(lang) },
+                { it.quality.contains(server, true) },
+                { it.quality.contains(quality) },
+                { Regex("""(\d+)p""").find(it.quality)?.groupValues?.get(1)?.toIntOrNull() ?: 0 },
+            ),
+        ).reversed()
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        val qualities = arrayOf(
-            "Okru:1080p", "Okru:720p", "Okru:480p", "Okru:360p", "Okru:240p", "Okru:144p", // Okru
-            "Streamlare:1080p", "Streamlare:720p", "Streamlare:480p", "Streamlare:360p", "Streamlare:240p", // Streamlare
-            "StreamTape", "Voex", "Uqload", "MixDrop",
-        )
-        val videoQualityPref = ListPreference(screen.context).apply {
-            key = "preferred_quality"
+        ListPreference(screen.context).apply {
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_QUALITY_KEY
             title = "Preferred quality"
-            entries = qualities
-            entryValues = qualities
-            setDefaultValue("Voex")
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -353,7 +514,22 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
-        screen.addPreference(videoQualityPref)
+        }.also(screen::addPreference)
+
+        ListPreference(screen.context).apply {
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
+            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()
+            }
+        }.also(screen::addPreference)
     }
 }

From ca989857aa51e6485319212564893007ddeadb24 Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sun, 29 Oct 2023 23:17:46 -0600
Subject: [PATCH 10/11] SetupPreference:updated

---
 .../animeextension/es/jkanime/Jkanime.kt      | 20 ++++++-------
 .../es/metroseries/MetroSeries.kt             | 20 ++++++-------
 .../es/pelisforte/PelisForte.kt               | 30 +++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
index ef7c422738..db7fd7ebb8 100644
--- a/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
+++ b/src/es/jkanime/src/eu/kanade/tachiyomi/animeextension/es/jkanime/Jkanime.kt
@@ -413,11 +413,11 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         ListPreference(screen.context).apply {
-            key = PREF_SERVER_KEY
-            title = "Preferred server"
-            entries = SERVER_LIST
-            entryValues = SERVER_LIST
-            setDefaultValue(PREF_SERVER_DEFAULT)
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -445,11 +445,11 @@ class Jkanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_LANGUAGE_KEY
-            title = "Preferred language"
-            entries = LANGUAGE_LIST
-            entryValues = LANGUAGE_LIST
-            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
diff --git a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
index 0e0df78ea4..b86de4d7c6 100644
--- a/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
+++ b/src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
@@ -262,11 +262,11 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         ListPreference(screen.context).apply {
-            key = PREF_SERVER_KEY
-            title = "Preferred server"
-            entries = SERVER_LIST
-            entryValues = SERVER_LIST
-            setDefaultValue(PREF_SERVER_DEFAULT)
+            key = PREF_QUALITY_KEY
+            title = "Preferred quality"
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -278,11 +278,11 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_QUALITY_KEY
-            title = "Preferred quality"
-            entries = QUALITY_LIST
-            entryValues = QUALITY_LIST
-            setDefaultValue(PREF_QUALITY_DEFAULT)
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
diff --git a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
index 5c4b5e589f..581f398ae9 100644
--- a/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
+++ b/src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
@@ -283,11 +283,11 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         ListPreference(screen.context).apply {
-            key = PREF_QUALITY_KEY
-            title = "Preferred quality"
-            entries = QUALITY_LIST
-            entryValues = QUALITY_LIST
-            setDefaultValue(PREF_QUALITY_DEFAULT)
+            key = PREF_LANGUAGE_KEY
+            title = "Preferred language"
+            entries = LANGUAGE_LIST
+            entryValues = LANGUAGE_LIST
+            setDefaultValue(PREF_LANGUAGE_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -299,11 +299,11 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_SERVER_KEY
-            title = "Preferred server"
-            entries = SERVER_LIST
-            entryValues = SERVER_LIST
-            setDefaultValue(PREF_SERVER_DEFAULT)
+            key = PREF_QUALITY_KEY
+            title = "Preferred quality"
+            entries = QUALITY_LIST
+            entryValues = QUALITY_LIST
+            setDefaultValue(PREF_QUALITY_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->
@@ -315,11 +315,11 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
         }.also(screen::addPreference)
 
         ListPreference(screen.context).apply {
-            key = PREF_LANGUAGE_KEY
-            title = "Preferred language"
-            entries = LANGUAGE_LIST
-            entryValues = LANGUAGE_LIST
-            setDefaultValue(PREF_LANGUAGE_DEFAULT)
+            key = PREF_SERVER_KEY
+            title = "Preferred server"
+            entries = SERVER_LIST
+            entryValues = SERVER_LIST
+            setDefaultValue(PREF_SERVER_DEFAULT)
             summary = "%s"
 
             setOnPreferenceChangeListener { _, newValue ->

From 4b78c9f1d27d583bd22003be9c6384f019f0cdac Mon Sep 17 00:00:00 2001
From: imper1aldev <imperialdev@outlook.com>
Date: Sun, 29 Oct 2023 23:29:42 -0600
Subject: [PATCH 11/11] extVersionCodes updated

---
 src/es/animeid/build.gradle        | 2 +-
 src/es/animelatinohd/build.gradle  | 2 +-
 src/es/animeyt/build.gradle        | 2 +-
 src/es/asialiveaction/build.gradle | 2 +-
 src/es/doramasflix/build.gradle    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/es/animeid/build.gradle b/src/es/animeid/build.gradle
index fab36fb74c..a7c8f50df2 100644
--- a/src/es/animeid/build.gradle
+++ b/src/es/animeid/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'AnimeID'
     pkgNameSuffix = 'es.animeid'
     extClass = '.AnimeID'
-    extVersionCode = 6
+    extVersionCode = 7
     libVersion = '13'
 }
 
diff --git a/src/es/animelatinohd/build.gradle b/src/es/animelatinohd/build.gradle
index 02cb3f98e4..a8b22c5b60 100644
--- a/src/es/animelatinohd/build.gradle
+++ b/src/es/animelatinohd/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'AnimeLatinoHD'
     pkgNameSuffix = 'es.animelatinohd'
     extClass = '.AnimeLatinoHD'
-    extVersionCode = 28
+    extVersionCode = 29
     libVersion = '13'
 }
 
diff --git a/src/es/animeyt/build.gradle b/src/es/animeyt/build.gradle
index 4f7aeacc59..3bfa79a5c5 100644
--- a/src/es/animeyt/build.gradle
+++ b/src/es/animeyt/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Animeyt'
     pkgNameSuffix = 'es.animeyt'
     extClass = '.Animeyt'
-    extVersionCode = 7
+    extVersionCode = 8
     libVersion = '13'
 }
 dependencies {
diff --git a/src/es/asialiveaction/build.gradle b/src/es/asialiveaction/build.gradle
index be11ba74f3..aeec13d4c9 100644
--- a/src/es/asialiveaction/build.gradle
+++ b/src/es/asialiveaction/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'AsiaLiveAction'
     pkgNameSuffix = 'es.asialiveaction'
     extClass = '.AsiaLiveAction'
-    extVersionCode = 21
+    extVersionCode = 22
     libVersion = '13'
 }
 
diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index 5657850b5d..689395c73f 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Doramasflix'
     pkgNameSuffix = 'es.doramasflix'
     extClass = '.Doramasflix'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '13'
 }