From 64fb4e3a3337352243d6f313d0976b517a2d95ff Mon Sep 17 00:00:00 2001
From: Dark25 <nadiecaca2000@gmail.com>
Date: Mon, 16 Sep 2024 00:04:38 +0200
Subject: [PATCH] feat(src/es): Implementation universal extractor in
 extensions Part 2

---
 src/es/doramasyt/build.gradle                               | 3 ++-
 .../tachiyomi/animeextension/es/doramasyt/Doramasyt.kt      | 4 +++-
 src/es/hackstore/build.gradle                               | 3 ++-
 .../tachiyomi/animeextension/es/hackstore/Hackstore.kt      | 4 +++-
 src/es/hentaila/build.gradle                                | 3 ++-
 .../kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt | 4 +++-
 src/es/hentaitk/build.gradle                                | 3 ++-
 .../kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt | 4 +++-
 src/es/lacartoons/build.gradle                              | 3 ++-
 .../tachiyomi/animeextension/es/lacartoons/Lacartoons.kt    | 3 ++-
 src/es/latanime/build.gradle                                | 5 +++--
 .../kanade/tachiyomi/animeextension/es/latanime/Latanime.kt | 5 +++++
 src/es/metroseries/build.gradle                             | 3 ++-
 .../tachiyomi/animeextension/es/metroseries/MetroSeries.kt  | 5 +++++
 src/es/monoschinos/build.gradle                             | 3 ++-
 .../tachiyomi/animeextension/es/monoschinos/MonosChinos.kt  | 6 ++++--
 .../animeextension/es/mundodonghua/MundoDonghua.kt          | 2 +-
 src/es/pelisplushd/build.gradle                             | 3 ++-
 .../tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt  | 6 ++++--
 src/es/tioanimeh/build.gradle                               | 3 ++-
 .../tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt      | 4 +++-
 src/es/veranimes/build.gradle                               | 3 ++-
 .../tachiyomi/animeextension/es/veranimes/VerAnimes.kt      | 4 +++-
 23 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
index 32420fa179..d44ee77a1d 100644
--- a/src/es/doramasyt/build.gradle
+++ b/src/es/doramasyt/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Doramasyt'
     extClass = '.Doramasyt'
-    extVersionCode = 15
+    extVersionCode = 16
 }
 
 apply from: "$rootDir/common.gradle"
@@ -15,4 +15,5 @@ dependencies {
     implementation(project(':lib:streamwish-extractor'))
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
index 403ff830a2..fb8c48cde5 100644
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
+++ b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/Doramasyt.kt
@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 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.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -190,6 +191,7 @@ class Doramasyt : ConfigurableAnimeSource, AnimeHttpSource() {
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
     private val uqloadExtractor by lazy { UqloadExtractor(client) }
     private val okruExtractor by lazy { OkruExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         val embedUrl = url.lowercase()
@@ -203,7 +205,7 @@ class Doramasyt : ConfigurableAnimeSource, AnimeHttpSource() {
             embedUrl.contains("doodstream") || embedUrl.contains("dood.") || embedUrl.contains("ds2play") || embedUrl.contains("doods.") -> doodExtractor.videosFromUrl(url)
             embedUrl.contains("filelions") || embedUrl.contains("lion") -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "FileLions:$it" })
             embedUrl.contains("mix") -> mixdropExtractor.videosFromUrl(url)
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/hackstore/build.gradle b/src/es/hackstore/build.gradle
index 2344a6e571..ebc12c871d 100644
--- a/src/es/hackstore/build.gradle
+++ b/src/es/hackstore/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hackstore'
     extClass = '.Hackstore'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
@@ -14,4 +14,5 @@ dependencies {
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:vidhide-extractor'))
     implementation(project(':lib:goodstream-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
index 177335acf7..bef8d4cb11 100644
--- a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
+++ b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.goodstramextractor.GoodStreamExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -202,6 +203,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val vidHideExtractor by lazy { VidHideExtractor(client, headers) }
     private val goodStreamExtractor by lazy { GoodStreamExtractor(client, headers) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -233,7 +235,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 server.contains("goodstream") || server.contains("vidstream") -> {
                     goodStreamExtractor.videosFromUrl(url, "$prefix GoodStream")
                 }
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(url, headers, prefix = prefix)
             }
         }
     }
diff --git a/src/es/hentaila/build.gradle b/src/es/hentaila/build.gradle
index 2c12913f23..f961fe556a 100644
--- a/src/es/hentaila/build.gradle
+++ b/src/es/hentaila/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiLA'
     extClass = '.Hentaila'
-    extVersionCode = 27
+    extVersionCode = 28
     isNsfw = true
 }
 
@@ -14,4 +14,5 @@ dependencies {
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:streamhidevid-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
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 7a9f43a25b..f6d8755b2c 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
@@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.lib.burstcloudextractor.BurstCloudExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -206,6 +207,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
     private val burstCloudExtractor by lazy { BurstCloudExtractor(client) }
     private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -227,7 +229,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
                 "mp4upload" -> mp4uploadExtractor.videosFromUrl(urlServer, headers = headers)
                 "burst" -> burstCloudExtractor.videoFromUrl(urlServer, headers = headers)
                 "vidhide", "streamhide", "guccihide", "streamvid" -> streamHideVidExtractor.videosFromUrl(urlServer)
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(urlServer, headers)
             }
         }
     }
diff --git a/src/es/hentaitk/build.gradle b/src/es/hentaitk/build.gradle
index 478b1d8002..243c2c1213 100644
--- a/src/es/hentaitk/build.gradle
+++ b/src/es/hentaitk/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiTk'
     extClass = '.Hentaitk'
-    extVersionCode = 8
+    extVersionCode = 9
     isNsfw = true
 }
 
@@ -15,4 +15,5 @@ dependencies {
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt b/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt
index 78823183b1..9312956ae9 100644
--- a/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt
+++ b/src/es/hentaitk/src/eu/kanade/tachiyomi/animeextension/es/hentaitk/Hentaitk.kt
@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -141,6 +142,7 @@ class Hentaitk : ConfigurableAnimeSource, AnimeHttpSource() {
     private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         val embedUrl = url.lowercase()
@@ -165,7 +167,7 @@ class Hentaitk : ConfigurableAnimeSource, AnimeHttpSource() {
             embedUrl.contains("streamtape") || embedUrl.contains("stp") ||
                 embedUrl.contains("stape")
             -> streamTapeExtractor.videosFromUrl(url, quality = "StreamTape")
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/lacartoons/build.gradle b/src/es/lacartoons/build.gradle
index ed8d2838d6..99a55f5afb 100644
--- a/src/es/lacartoons/build.gradle
+++ b/src/es/lacartoons/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'LACartoons'
     extClass = '.Lacartoons'
-    extVersionCode = 6
+    extVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +12,5 @@ dependencies {
     implementation(project(':lib:streamhidevid-extractor'))
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:yourupload-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt b/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt
index 0d0ceeda3d..239d446ad7 100644
--- a/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt
+++ b/src/es/lacartoons/src/eu/kanade/tachiyomi/animeextension/es/lacartoons/Lacartoons.kt
@@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -147,7 +148,7 @@ class Lacartoons : ConfigurableAnimeSource, AnimeHttpSource() {
                 embedUrl.contains("guccihide") || embedUrl.contains("streamvid") -> StreamHideVidExtractor(client).videosFromUrl(url)
             embedUrl.contains("voe") -> VoeExtractor(client).videosFromUrl(url)
             embedUrl.contains("yourupload") || embedUrl.contains("upload") -> YourUploadExtractor(client).videoFromUrl(url, headers = headers)
-            else -> emptyList()
+            else -> UniversalExtractor(client).videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/latanime/build.gradle b/src/es/latanime/build.gradle
index 107584fb62..3c1bd7b1b5 100644
--- a/src/es/latanime/build.gradle
+++ b/src/es/latanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Latanime'
     extClass = '.Latanime'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,5 +12,6 @@ dependencies {
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:okru-extractor'))
     implementation(project(':lib:dood-extractor'))
-    implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
+    implementation(project(':lib:universal-extractor'))
+    implementation libs.jsunpacker
 }
\ No newline at end of file
diff --git a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt b/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
index 0f7630ae75..2a534db068 100644
--- a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
+++ b/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/Latanime.kt
@@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -304,6 +305,10 @@ class Latanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     val videos = YourUploadExtractor(client).videoFromUrl(url, headers = headers, name = "Original", prefix = prefix)
                     videoList.addAll(videos)
                 }
+                else -> {
+                    val videos = UniversalExtractor(client).videosFromUrl(url, headers)
+                    videoList.addAll(videos)
+                }
             }
         }
 
diff --git a/src/es/metroseries/build.gradle b/src/es/metroseries/build.gradle
index 274adc80b2..2a108972d8 100644
--- a/src/es/metroseries/build.gradle
+++ b/src/es/metroseries/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MetroSeries'
     extClass = '.MetroSeries'
-    extVersionCode = 13
+    extVersionCode = 14
 }
 
 apply from: "$rootDir/common.gradle"
@@ -15,4 +15,5 @@ dependencies {
     implementation(project(':lib:fastream-extractor'))
     implementation(project(':lib:upstream-extractor'))
     implementation(project(':lib:filemoon-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
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 fe841e3cb2..8a3fee1658 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
@@ -16,6 +16,7 @@ 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.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -255,6 +256,10 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
                     if (src.contains("filemoon") || src.contains("moonplayer")) {
                         FilemoonExtractor(client).videosFromUrl(src, headers = headers, prefix = "$prefix Filemoon:").let { videoList.addAll(it) }
                     }
+                    // si los demas fallan intenta con universal
+                    if (videoList.isEmpty()) {
+                        UniversalExtractor(client).videosFromUrl(src, headers, prefix = prefix).let { videoList.addAll(it) }
+                    }
                 } catch (_: Exception) {}
             }
         }
diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
index a22dc4c43a..46ab1e812e 100644
--- a/src/es/monoschinos/build.gradle
+++ b/src/es/monoschinos/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MonosChinos'
     extClass = '.MonosChinos'
-    extVersionCode = 29
+    extVersionCode = 30
 }
 
 apply from: "$rootDir/common.gradle"
@@ -16,4 +16,5 @@ dependencies {
     implementation(project(':lib:streamwish-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
     implementation(project(':lib:dood-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
index 2b8c2415ba..47c909a61b 100644
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
+++ b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
@@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 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.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -181,7 +182,7 @@ class MonosChinos : ConfigurableAnimeSource, AnimeHttpSource() {
         val document = response.asJsoup()
         return document.select("[data-player]")
             .map { String(Base64.decode(it.attr("data-player"), Base64.DEFAULT)) }
-            .parallelCatchingFlatMapBlocking { serverVideoResolver(it) }
+            .parallelCatchingFlatMapBlocking { serverVideoResolver(it) }.sort()
     }
 
     override fun getFilterList(): AnimeFilterList = MonosChinosFilters.FILTER_LIST
@@ -195,6 +196,7 @@ class MonosChinos : ConfigurableAnimeSource, AnimeHttpSource() {
     private val uqloadExtractor by lazy { UqloadExtractor(client) }
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         val embedUrl = url.lowercase()
@@ -209,7 +211,7 @@ class MonosChinos : ConfigurableAnimeSource, AnimeHttpSource() {
             embedUrl.contains("filelions") || embedUrl.contains("lion") -> streamwishExtractor.videosFromUrl(url, videoNameGen = { "FileLions:$it" })
             embedUrl.contains("mp4upload") || embedUrl.contains("mp4") -> mp4uploadExtractor.videosFromUrl(url, headers)
             embedUrl.contains("mix") -> mixdropExtractor.videosFromUrl(url)
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }
 
diff --git a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
index 0bcee0f319..c8669c8076 100644
--- a/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
+++ b/src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
@@ -164,7 +164,7 @@ class MundoDonghua : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
             }
         }
-        return videoList
+        return videoList.sort()
     }
 
     override fun videoListSelector() = throw UnsupportedOperationException()
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 01c039fb53..f2f233a252 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Pelisplushd'
     extClass = '.PelisplushdFactory'
-    extVersionCode = 66
+    extVersionCode = 67
 }
 
 apply from: "$rootDir/common.gradle"
@@ -25,5 +25,6 @@ dependencies {
     implementation(project(':lib:streamhidevid-extractor'))
     implementation(project(':lib:streamsilk-extractor'))
     implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
     implementation libs.jsunpacker
 }
\ No newline at end of file
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 1ddaf869e6..42d83500c9 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
@@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamsilkextractor.StreamSilkExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
@@ -149,7 +150,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                 }.also(videoList::addAll)
             }
         }
-        return videoList
+        return videoList.sort()
     }
 
     /*--------------------------------Video extractors------------------------------------*/
@@ -169,6 +170,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
     private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) }
     private val streamSilkExtractor by lazy { StreamSilkExtractor(client) }
     private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
         return runCatching {
@@ -211,7 +213,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                 arrayOf("streamtape", "stp", "stape").any(url) -> streamTapeExtractor.videosFromUrl(url, quality = "$prefix StreamTape")
                 arrayOf("ahvsh", "streamhide", "guccihide", "streamvid", "vidhide").any(url) -> streamHideVidExtractor.videosFromUrl(url, prefix = "$prefix ")
                 arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url, prefix = "$prefix ")
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(url, headers, prefix = "$prefix ")
             }
         }.getOrNull() ?: emptyList()
     }
diff --git a/src/es/tioanimeh/build.gradle b/src/es/tioanimeh/build.gradle
index 6a419ce085..bbbf14ed1e 100644
--- a/src/es/tioanimeh/build.gradle
+++ b/src/es/tioanimeh/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'TioanimeH'
     extClass = '.TioanimeHFactory'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"
@@ -12,4 +12,5 @@ dependencies {
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
     implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
diff --git a/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt b/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
index b8ec5a4cf7..68549e89a7 100644
--- a/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
+++ b/src/es/tioanimeh/src/eu/kanade/tachiyomi/animeextension/es/tioanimeh/TioanimeH.kt
@@ -12,6 +12,7 @@ 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.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -94,6 +95,7 @@ open class TioanimeH(override val name: String, override val baseUrl: String) :
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val mixDropExtractor by lazy { MixDropExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -112,7 +114,7 @@ open class TioanimeH(override val name: String, override val baseUrl: String) :
                 "okru" -> okruExtractor.videosFromUrl(serverUrl)
                 "yourupload" -> yourUploadExtractor.videoFromUrl(serverUrl, headers = headers)
                 "mixdrop" -> mixDropExtractor.videosFromUrl(serverUrl)
-                else -> emptyList()
+                else -> universalExtractor.videosFromUrl(serverUrl, headers)
             }
         }
     }
diff --git a/src/es/veranimes/build.gradle b/src/es/veranimes/build.gradle
index 34a18e1bd9..fedc93d89e 100644
--- a/src/es/veranimes/build.gradle
+++ b/src/es/veranimes/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'VerAnimes'
     extClass = '.VerAnimes'
-    extVersionCode = 5
+    extVersionCode = 6
 }
 
 apply from: "$rootDir/common.gradle"
@@ -13,4 +13,5 @@ dependencies {
     implementation(project(':lib:voe-extractor'))
     implementation(project(':lib:yourupload-extractor'))
     implementation(project(':lib:vidguard-extractor'))
+    implementation(project(':lib:universal-extractor'))
 }
\ No newline at end of file
diff --git a/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt b/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt
index 7adf0f8e60..66df46af98 100644
--- a/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt
+++ b/src/es/veranimes/src/eu/kanade/tachiyomi/animeextension/es/veranimes/VerAnimes.kt
@@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+import eu.kanade.tachiyomi.lib.universalextractor.UniversalExtractor
 import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
@@ -165,6 +166,7 @@ class VerAnimes : ConfigurableAnimeSource, AnimeHttpSource() {
     private val voeExtractor by lazy { VoeExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
+    private val universalExtractor by lazy { UniversalExtractor(client) }
 
     private fun serverVideoResolver(url: String): List<Video> {
         return when {
@@ -175,7 +177,7 @@ class VerAnimes : ConfigurableAnimeSource, AnimeHttpSource() {
             arrayOf("voe").any(url) -> voeExtractor.videosFromUrl(url)
             arrayOf("yourupload", "upload").any(url) -> yourUploadExtractor.videoFromUrl(url, headers = headers)
             arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url)
-            else -> emptyList()
+            else -> universalExtractor.videosFromUrl(url, headers)
         }
     }