From ca0c58fe23096233f8c093b24e424942bd4c0973 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Sat, 9 Sep 2023 08:23:07 -0300
Subject: [PATCH] refactor: Make extensions use the uqload-extractor lib
 (#2161)

---
 .../animeonlineninja/additional.gradle        |  1 +
 .../animeonlineninja/src/AnimeOnlineNinja.kt  | 12 ++---
 .../src/extractors/UploadExtractor.kt         | 21 --------
 src/ar/animerco/build.gradle                  |  1 +
 .../animeextension/ar/animerco/Animerco.kt    |  6 +--
 .../ar/animerco/extractors/UQLoadExtractor.kt | 17 -------
 src/ar/mycima/build.gradle                    |  4 ++
 .../animeextension/ar/mycima/MyCima.kt        |  4 +-
 .../ar/mycima/extractors/UQLoadExtractor.kt   | 18 -------
 src/ar/tuktukcinema/build.gradle              |  1 +
 .../ar/tuktukcinema/Tuktukcinema.kt           |  4 +-
 .../extractors/UQLoadExtractor.kt             | 19 -------
 src/es/doramasflix/build.gradle               |  1 +
 .../es/doramasflix/Doramasflix.kt             | 50 +++++++------------
 .../doramasflix/extractor/UqloadExtractor.kt  | 28 -----------
 src/es/doramasyt/build.gradle                 |  1 +
 .../animeextension/es/doramasyt/Doramasyt.kt  | 13 ++---
 .../doramasyt/extractors/UqloadExtractor.kt   | 28 -----------
 src/es/latanime/build.gradle                  |  1 +
 .../animeextension/es/latanime/Latanime.kt    |  5 +-
 .../es/latanime/extractors/UploadExtractor.kt | 19 -------
 src/es/legionanime/build.gradle               |  1 +
 .../es/legionanime/LegionAnime.kt             |  9 +---
 .../legionanime/extractors/UploadExtractor.kt | 19 -------
 .../legionanime/extractors/UqloadExtractor.kt | 23 ---------
 src/es/monoschinos/build.gradle               |  2 +-
 .../es/monoschinos/MonosChinos.kt             |  6 +--
 .../monoschinos/extractors/UploadExtractor.kt | 23 ---------
 src/es/pelisplushd/build.gradle               |  1 +
 .../es/pelisplushd/Pelisplushd.kt             |  2 +-
 .../es/pelisplushd/Pelisplusph.kt             |  4 +-
 .../es/pelisplushd/Pelisplusto.kt             |  4 +-
 .../pelisplushd/extractors/UqloadExtractor.kt | 26 ----------
 src/fr/frenchanime/build.gradle               |  1 +
 .../fr/frenchanime/FrenchAnime.kt             |  4 +-
 .../frenchanime/extractors/UqloadExtractor.kt | 26 ----------
 .../animeextension/pt/flixei/Flixei.kt        |  1 -
 src/tr/anizm/build.gradle                     |  1 +
 .../animeextension/tr/anizm/Anizm.kt          |  6 +--
 .../tr/anizm/extractors/UQLoadExtractor.kt    | 19 -------
 src/tr/turkanime/build.gradle                 |  1 +
 .../animeextension/tr/turkanime/TurkAnime.kt  |  4 +-
 .../turkanime/extractors/UqloadExtractor.kt   | 26 ----------
 43 files changed, 68 insertions(+), 395 deletions(-)
 delete mode 100644 multisrc/overrides/dooplay/animeonlineninja/src/extractors/UploadExtractor.kt
 delete mode 100644 src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt
 delete mode 100644 src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/extractors/UQLoadExtractor.kt
 delete mode 100644 src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/extractors/UQLoadExtractor.kt
 delete mode 100644 src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/UqloadExtractor.kt
 delete mode 100644 src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/UqloadExtractor.kt
 delete mode 100644 src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/extractors/UploadExtractor.kt
 delete mode 100644 src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UploadExtractor.kt
 delete mode 100644 src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UqloadExtractor.kt
 delete mode 100644 src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/UploadExtractor.kt
 delete mode 100644 src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/UqloadExtractor.kt
 delete mode 100644 src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/UqloadExtractor.kt
 delete mode 100644 src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/extractors/UQLoadExtractor.kt
 delete mode 100644 src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/extractors/UqloadExtractor.kt

diff --git a/multisrc/overrides/dooplay/animeonlineninja/additional.gradle b/multisrc/overrides/dooplay/animeonlineninja/additional.gradle
index f7912c3c4..e96e9cf08 100644
--- a/multisrc/overrides/dooplay/animeonlineninja/additional.gradle
+++ b/multisrc/overrides/dooplay/animeonlineninja/additional.gradle
@@ -3,4 +3,5 @@ dependencies {
     implementation(project(':lib-dood-extractor'))
     implementation(project(':lib-filemoon-extractor'))
     implementation(project(':lib-mixdrop-extractor'))
+    implementation(project(':lib-uqload-extractor'))
 }
diff --git a/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt b/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt
index 944e5ba24..37cbce00f 100644
--- a/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt
+++ b/multisrc/overrides/dooplay/animeonlineninja/src/AnimeOnlineNinja.kt
@@ -3,13 +3,13 @@ package eu.kanade.tachiyomi.animeextension.es.animeonlineninja
 import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.UploadExtractor
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -26,8 +26,9 @@ class AnimeOnlineNinja : DooPlay(
 ) {
     override val client by lazy {
         if (preferences.getBoolean(PREF_VRF_INTERCEPT_KEY, PREF_VRF_INTERCEPT_DEFAULT)) {
-            network.cloudflareClient
-                .newBuilder().addInterceptor(VrfInterceptor()).build()
+            network.cloudflareClient.newBuilder()
+                .addInterceptor(VrfInterceptor())
+                .build()
         } else {
             network.cloudflareClient
         }
@@ -114,7 +115,7 @@ class AnimeOnlineNinja : DooPlay(
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
     private val mixDropExtractor by lazy { MixDropExtractor(client) }
-    private val uqloadExtractor by lazy { UploadExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
 
     private fun extractVideos(url: String, lang: String): List<Video> {
         return when {
@@ -131,8 +132,7 @@ class AnimeOnlineNinja : DooPlay(
             "mixdrop" in url ->
                 mixDropExtractor.videoFromUrl(url, lang)
             "uqload" in url ->
-                uqloadExtractor.videoFromUrl(url, headers, lang)
-                    ?.let(::listOf)
+                uqloadExtractor.videosFromUrl(url)
             "wolfstream" in url -> {
                 client.newCall(GET(url, headers)).execute()
                     .use { it.asJsoup() }
diff --git a/multisrc/overrides/dooplay/animeonlineninja/src/extractors/UploadExtractor.kt b/multisrc/overrides/dooplay/animeonlineninja/src/extractors/UploadExtractor.kt
deleted file mode 100644
index 88aba2a51..000000000
--- a/multisrc/overrides/dooplay/animeonlineninja/src/extractors/UploadExtractor.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UploadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, headers: Headers, quality: String): Video? {
-        val newHeaders = headers.newBuilder().add("referer", "https://uqload.com/").build()
-        return runCatching {
-            val document = client.newCall(GET(url, newHeaders)).execute().asJsoup()
-            val basicUrl = document.selectFirst("script:containsData(var player =)")!!
-                .data()
-                .substringAfter("sources: [\"")
-                .substringBefore("\"],")
-            Video(basicUrl, "$quality Uqload", basicUrl, headers = headers)
-        }.getOrNull()
-    }
-}
diff --git a/src/ar/animerco/build.gradle b/src/ar/animerco/build.gradle
index 265cbcc82..79f975557 100644
--- a/src/ar/animerco/build.gradle
+++ b/src/ar/animerco/build.gradle
@@ -12,6 +12,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-gdriveplayer-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-dood-extractor'))
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt
index 5d2b33c8d..165e74c00 100644
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt
+++ b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/Animerco.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.SharedExtractor
-import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.UQLoadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -18,6 +17,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.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -171,7 +171,7 @@ class Animerco : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val gdrivePlayerExtractor by lazy { GdrivePlayerExtractor(client) }
     private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
     private val sharedExtractor by lazy { SharedExtractor(client) }
-    private val uqloadExtractor by lazy { UQLoadExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
     private val vidBomExtractor by lazy { VidBomExtractor(client) }
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
     private val okruExtractor by lazy { OkruExtractor(client) }
@@ -193,7 +193,7 @@ class Animerco : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             "streamtape" in url -> streamTapeExtractor.videoFromUrl(url)?.let(::listOf)
             "4shared" in url -> sharedExtractor.videoFromUrl(url)?.let(::listOf)
-            "uqload" in url -> uqloadExtractor.videoFromUrl(url)?.let(::listOf)
+            "uqload" in url -> uqloadExtractor.videosFromUrl(url)
             VIDBOM_DOMAINS.any(url::contains) -> vidBomExtractor.videosFromUrl(url)
             else -> null
         } ?: emptyList()
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt
deleted file mode 100644
index 209e56ea7..000000000
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/UQLoadExtractor.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.animerco.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
-
-class UQLoadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String = "uqload"): Video? {
-        val document = client.newCall(GET(url)).execute().use { it.asJsoup() }
-        val check = document.selectFirst("script:containsData(sources)")?.data()
-            ?: return null
-        val videoUrl = check.substringAfter("sources: [\"", "").substringBefore("\"", "")
-        if (videoUrl.isBlank()) return null
-        return Video(videoUrl, quality, videoUrl)
-    }
-}
diff --git a/src/ar/mycima/build.gradle b/src/ar/mycima/build.gradle
index f3670d806..fdf653d9f 100644
--- a/src/ar/mycima/build.gradle
+++ b/src/ar/mycima/build.gradle
@@ -9,4 +9,8 @@ ext {
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-uqload-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt b/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt
index b3e84f49e..f7b3f7ae8 100644
--- a/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt
+++ b/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/MyCima.kt
@@ -6,7 +6,6 @@ import android.widget.Toast
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.ar.mycima.extractors.GoVadExtractor
-import eu.kanade.tachiyomi.animeextension.ar.mycima.extractors.UQLoadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -14,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.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import kotlinx.coroutines.Dispatchers
@@ -148,7 +148,7 @@ class MyCima : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             UQLOAD_REGEX.containsMatchIn(url) -> {
                 val finalUrl = UQLOAD_REGEX.find(url)!!.groupValues[0]
-                UQLoadExtractor(client).videosFromUrl("https://www.$finalUrl.html")
+                UqloadExtractor(client).videosFromUrl("https://www.$finalUrl.html")
             }
             else -> null
         } ?: emptyList()
diff --git a/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/extractors/UQLoadExtractor.kt b/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/extractors/UQLoadExtractor.kt
deleted file mode 100644
index e7d5c7063..000000000
--- a/src/ar/mycima/src/eu/kanade/tachiyomi/animeextension/ar/mycima/extractors/UQLoadExtractor.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.mycima.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
-
-class UQLoadExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String): List<Video> {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-        val check = document.selectFirst("script:containsData(sources)")!!.data()
-        val videoUrl = check.substringAfter("sources: [\"").substringBefore("\"")
-        return when {
-            "soruces" in check -> Video(videoUrl, "UQLoad Mirror", videoUrl).let(::listOf)
-            else -> emptyList()
-        }
-    }
-}
diff --git a/src/ar/tuktukcinema/build.gradle b/src/ar/tuktukcinema/build.gradle
index 51d27c6da..bfeb2b5f6 100644
--- a/src/ar/tuktukcinema/build.gradle
+++ b/src/ar/tuktukcinema/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-okru-extractor'))
     implementation(project(':lib-dood-extractor'))
     implementation(project(':lib-streamtape-extractor'))
diff --git a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
index 75711b6c5..f23fe3d01 100644
--- a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
+++ b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt
@@ -6,7 +6,6 @@ import android.widget.Toast
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.ar.tuktukcinema.extractors.UQLoadExtractor
 import eu.kanade.tachiyomi.animeextension.ar.tuktukcinema.extractors.UpStreamExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -163,7 +163,7 @@ class Tuktukcinema : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 DoodExtractor(client).videoFromUrl("https://www.$finalUrl", "Dood mirror", false)?.let(::listOf)
             }
             url.contains("uqload") -> {
-                UQLoadExtractor(client).videoFromUrl(url, "Uqload mirror")?.let(::listOf)
+                UqloadExtractor(client).videosFromUrl(url, "mirror")
             }
             url.contains("tape") -> {
                 StreamTapeExtractor(client).videoFromUrl(url)?.let(::listOf)
diff --git a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/extractors/UQLoadExtractor.kt b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/extractors/UQLoadExtractor.kt
deleted file mode 100644
index 68389a502..000000000
--- a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/extractors/UQLoadExtractor.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.tuktukcinema.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
-
-class UQLoadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-        val check = document.selectFirst("script:containsData(sources)")!!.data()
-        val videoUrl = check.substringAfter("sources: [\"").substringBefore("\"")
-        return if (check.contains("sources")) {
-            Video(url, quality, videoUrl)
-        } else {
-            null
-        }
-    }
-}
diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index a1cfe5f67..a2154c639 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-mixdrop-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-okru-extractor'))
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 355dd8109..6818feda5 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
@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.doramasflix.extractor.UqloadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 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.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
@@ -316,44 +316,28 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     private fun resolveVideoServer(link: String): List<Video> {
-        val videos = mutableListOf<Video>()
-        if (link.contains("streamtape")) {
-            try {
-                StreamTapeExtractor(client).videoFromUrl(link)?.let { videos.add(it) }
-            } catch (_: Exception) {}
-        }
-        if (link.contains("mixdrop")) {
-            try {
-                MixDropExtractor(client).videoFromUrl(link).let { videos.addAll(it) }
-            } catch (_: Exception) {}
-        }
-        if (link.contains("uqload")) {
-            try {
-                val headers = headers.newBuilder()
-                    .add("authority", "uqload.co")
-                    .add("referer", "https://uqload.co/")
-                    .build()
-                UqloadExtractor(client).videoFromUrl(link, headers, "YourUpload").let { videos.addAll(it) }
-            } catch (_: Exception) {}
-        }
-        if (link.contains("ok.ru")) {
-            try {
-                OkruExtractor(client).videosFromUrl(link, "", true).let { videos.addAll(it) }
-            } catch (_: Exception) {}
-        }
-        if (link.contains("voe")) {
-            try {
-                VoeExtractor(client).videoFromUrl(link, "Voex")?.let { videos.add(it) }
-            } catch (_: Exception) {}
-        }
-        return videos
+        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
+            }
+        }.getOrNull() ?: emptyList()
     }
 
     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", "DoodStream", "YourUpload", "MixDrop",
+            "StreamTape", "Voex", "Uqload", "MixDrop",
         )
         val videoQualityPref = ListPreference(screen.context).apply {
             key = "preferred_quality"
diff --git a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/UqloadExtractor.kt b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/UqloadExtractor.kt
deleted file mode 100644
index fa5fd0ac2..000000000
--- a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/UqloadExtractor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.doramasflix.extractor
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UqloadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, headers: Headers, quality: String): List<Video> {
-        val videoList = mutableListOf<Video>()
-        return try {
-            val document = client.newCall(GET(url)).execute()
-            if (document.isSuccessful) {
-                val response = document.asJsoup()
-                response.select("script").map {
-                    if (it.data().contains("var player =")) {
-                        val basicUrl = it.data().substringAfter("sources: [\"").substringBefore("\"],")
-                        videoList.add(Video(basicUrl, quality, basicUrl, headers = headers))
-                    }
-                }
-            }
-            videoList
-        } catch (e: Exception) {
-            videoList
-        }
-    }
-}
diff --git a/src/es/doramasyt/build.gradle b/src/es/doramasyt/build.gradle
index abe293cf3..367a8213e 100644
--- a/src/es/doramasyt/build.gradle
+++ b/src/es/doramasyt/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-okru-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 fc42b7cc0..f7da1a1a2 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
@@ -6,7 +6,6 @@ import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors.SolidFilesExtractor
-import eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors.UqloadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -16,6 +15,7 @@ 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.streamtapeextractor.StreamTapeExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.OkHttpClient
@@ -106,13 +106,8 @@ class Doramasyt : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 val videos = SolidFilesExtractor(client).videosFromUrl(url)
                 videoList.addAll(videos)
             }
-            if (server.contains("uqload")) {
-                val headers = headers.newBuilder().add("referer", "https://uqload.com/").build()
-                UqloadExtractor(client).videoFromUrl(url, headers, "Uqload").map { videoList.add(it) }
-            }
-            if (server.contains("upload")) {
-                val headers = headers.newBuilder().add("referer", "https://upload.com/").build()
-                UqloadExtractor(client).videoFromUrl(url, headers, "Upload").map { videoList.add(it) }
+            if (server.contains("uqload") || server.contains("upload")) {
+                videoList.addAll(UqloadExtractor(client).videosFromUrl(url))
             }
         }
         return videoList
@@ -274,7 +269,7 @@ class Doramasyt : 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", // video servers without resolution
+            "Uqload", "SolidFiles", "StreamTape", // video servers without resolution
         )
         val videoQualityPref = ListPreference(screen.context).apply {
             key = "preferred_quality"
diff --git a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/UqloadExtractor.kt b/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/UqloadExtractor.kt
deleted file mode 100644
index 9e738a423..000000000
--- a/src/es/doramasyt/src/eu/kanade/tachiyomi/animeextension/es/doramasyt/extractors/UqloadExtractor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.doramasyt.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UqloadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, headers: Headers, quality: String): List<Video> {
-        val videoList = mutableListOf<Video>()
-        return try {
-            val document = client.newCall(GET(url)).execute()
-            if (document.isSuccessful) {
-                val response = document.asJsoup()
-                response.select("script").map {
-                    if (it.data().contains("var player =")) {
-                        val basicUrl = it.data().substringAfter("sources: [\"").substringBefore("\"],")
-                        videoList.add(Video(basicUrl, quality, basicUrl, headers = headers))
-                    }
-                }
-            }
-            videoList
-        } catch (e: Exception) {
-            videoList
-        }
-    }
-}
diff --git a/src/es/latanime/build.gradle b/src/es/latanime/build.gradle
index 49057b394..0cd75909f 100644
--- a/src/es/latanime/build.gradle
+++ b/src/es/latanime/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-mp4upload-extractor'))
     implementation(project(':lib-yourupload-extractor'))
     implementation(project(':lib-okru-extractor'))
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 ae8a209a8..296079c4f 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
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.latanime.extractors.UploadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -16,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.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -296,8 +296,7 @@ class Latanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     videoList.addAll(videos)
                 }
                 url.contains("uqload") -> {
-                    val headers = headers.newBuilder().add("referer", "https://uqload.com/").build()
-                    val videos = UploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix)
+                    val videos = UqloadExtractor(client).videosFromUrl(url, prefix)
                     videoList.addAll(videos)
                 }
                 url.contains("doodstream") -> {
diff --git a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/extractors/UploadExtractor.kt b/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/extractors/UploadExtractor.kt
deleted file mode 100644
index 9f16d4b7f..000000000
--- a/src/es/latanime/src/eu/kanade/tachiyomi/animeextension/es/latanime/extractors/UploadExtractor.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.latanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UploadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, headers: Headers, prefix: String): List<Video> {
-        return try {
-            val document = client.newCall(GET(url)).execute().asJsoup()
-            val basicUrl = document.selectFirst("script:containsData(var player =)")!!.data().substringAfter("sources: [\"").substringBefore("\"],")
-            return listOf(Video(basicUrl, "${prefix}Uqload", basicUrl, headers = headers))
-        } catch (e: Exception) {
-            emptyList()
-        }
-    }
-}
diff --git a/src/es/legionanime/build.gradle b/src/es/legionanime/build.gradle
index 68fb9b852..a5ecb641c 100644
--- a/src/es/legionanime/build.gradle
+++ b/src/es/legionanime/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-mp4upload-extractor'))
     implementation(project(':lib-yourupload-extractor'))
     implementation(project(':lib-streamtape-extractor'))
diff --git a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt b/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt
index 7d15da35c..0237a923e 100644
--- a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt
+++ b/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/LegionAnime.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.es.legionanime.extractors.JkanimeExtractor
-import eu.kanade.tachiyomi.animeextension.es.legionanime.extractors.UqloadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -19,6 +18,7 @@ import eu.kanade.tachiyomi.lib.gdriveplayerextractor.GdrivePlayerExtractor
 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.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
@@ -338,12 +338,7 @@ class LegionAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
             }
             url.contains("uqload") -> {
-                val video = UqloadExtractor(client).videoFromUrl(url, headers)
-                if (video != null) {
-                    listOf(video)
-                } else {
-                    emptyList()
-                }
+                UqloadExtractor(client).videosFromUrl(url)
             }
             else -> emptyList()
         }
diff --git a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UploadExtractor.kt b/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UploadExtractor.kt
deleted file mode 100644
index cfc787835..000000000
--- a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UploadExtractor.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.legionanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UploadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, headers: Headers): Video? {
-        return try {
-            val document = client.newCall(GET(url)).execute().asJsoup()
-            val basicUrl = document.selectFirst("script:containsData(var player =)")!!.data().substringAfter("sources: [\"").substringBefore("\"],")
-            return Video(basicUrl, "Uqload", basicUrl, headers = headers)
-        } catch (e: Exception) {
-            null
-        }
-    }
-}
diff --git a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UqloadExtractor.kt b/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UqloadExtractor.kt
deleted file mode 100644
index 2ccd0e884..000000000
--- a/src/es/legionanime/src/eu/kanade/tachiyomi/animeextension/es/legionanime/extractors/UqloadExtractor.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.legionanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UqloadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, headers: Headers): Video? {
-        return try {
-            val document = client.newCall(GET(url)).execute().asJsoup()
-            val basicUrl = document.selectFirst("script:containsData(var player =)")!!.data().substringAfter("sources: [\"").substringBefore("\"],")
-
-            if (!basicUrl.contains("http")) {
-                return null
-            }
-            return Video(basicUrl, "Uqload", basicUrl, headers = headers)
-        } catch (e: Exception) {
-            null
-        }
-    }
-}
diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
index b5ba57ab5..2b9d04cfe 100644
--- a/src/es/monoschinos/build.gradle
+++ b/src/es/monoschinos/build.gradle
@@ -10,9 +10,9 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-mp4upload-extractor'))
     implementation(project(':lib-okru-extractor'))
 }
 
-
 apply from: "$rootDir/common.gradle"
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 ab0ff7260..1c6b5d90d 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
@@ -6,7 +6,6 @@ import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.es.monoschinos.extractors.SolidFilesExtractor
-import eu.kanade.tachiyomi.animeextension.es.monoschinos.extractors.UploadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.OkHttpClient
@@ -81,7 +81,6 @@ class MonosChinos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
         val videoList = mutableListOf<Video>()
-        val headers = headers.newBuilder().add("referer", "https://uqload.com/").build()
         document.select("div.heroarea div.row div.col-md-12 ul.dropcaps li").forEach { it ->
             // val server = it.select("a").text()
             val urlBase64 = it.select("a").attr("data-player")
@@ -90,8 +89,7 @@ class MonosChinos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 url.contains("ok") -> if (!url.contains("streamcherry")) videoList.addAll(OkruExtractor(client).videosFromUrl(url))
                 url.contains("solidfiles") -> videoList.addAll(SolidFilesExtractor(client).videosFromUrl(url))
                 url.contains("uqload") -> {
-                    val video = UploadExtractor(client).videoFromUrl(url, headers)
-                    if (video != null) videoList.add(video)
+                    videoList.addAll(UqloadExtractor(client).videosFromUrl(url))
                 }
                 url.contains("mp4upload") -> {
                     val videos = Mp4uploadExtractor(client).videosFromUrl(url, headers)
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/UploadExtractor.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/UploadExtractor.kt
deleted file mode 100644
index d46635669..000000000
--- a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/extractors/UploadExtractor.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.monoschinos.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UploadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, headers: Headers): Video? {
-        return try {
-            val document = client.newCall(GET(url)).execute().asJsoup()
-            val basicUrl = document.selectFirst("script:containsData(var player =)")!!.data().substringAfter("sources: [\"").substringBefore("\"],")
-
-            if (!basicUrl.contains("http")) {
-                return null
-            }
-            return Video(basicUrl, "Uqload", basicUrl, headers = headers)
-        } catch (e: Exception) {
-            null
-        }
-    }
-}
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 99cbb84ae..02996c970 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(':lib-streamwish-extractor'))
     implementation(project(':lib-filemoon-extractor'))
     implementation(project(':lib-streamlare-extractor'))
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 4b817b5d3..e14202de1 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
@@ -137,7 +137,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
                         "sbfast" -> { serverUrl = "https://sbfull.com/e/$urlId" }
                         "plusto" -> { serverUrl = "https://owodeuwu.xyz/v/$urlId" }
                         "doodstream" -> { serverUrl = "https://dood.to/e/$urlId" }
-                        "upload" -> { serverUrl = "https://uqload.com/embed-$urlId.html" }
+                        "upload", "uqload" -> { serverUrl = "https://uqload.com/embed-$urlId.html" }
                     }
                 }
                 serverVideoResolver(serverUrl, serverName)?.forEach { video -> videoList.add(video) }
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 081de79c9..2f90593ba 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
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.animeextension.es.pelisplushd
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.StreamHideExtractor
-import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.UqloadExtractor
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+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
@@ -187,7 +187,7 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
             StreamHideExtractor(client).videosFromUrl(url, "StreamHide")
         }
         if (embedUrl.contains("uqload")) {
-            UqloadExtractor(client).videosFromUrl(url, headers)
+            UqloadExtractor(client).videosFromUrl(url)
         }
         return videoList
     }
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 aa5a741fc..e1b43249e 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
@@ -4,7 +4,6 @@ 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.animeextension.es.pelisplushd.extractors.UqloadExtractor
 import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.VudeoExtractor
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -16,6 +15,7 @@ import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamlareextractor.StreamlareExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
+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
@@ -196,7 +196,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
             videoList.addAll(StreamlareExtractor(client).videosFromUrl(url))
         }
         if (embedUrl.contains("uqload")) {
-            UqloadExtractor(client).videosFromUrl(url, headers)
+            UqloadExtractor(client).videosFromUrl(url)
         }
         if (embedUrl.contains("streamwish")) {
             val docHeaders = headers.newBuilder()
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/UqloadExtractor.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/UqloadExtractor.kt
deleted file mode 100644
index 80e3468e9..000000000
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/UqloadExtractor.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors
-
-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
-
-class UqloadExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers, quality: String = "Uqload"): List<Video> {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-        val check = document.selectFirst("script:containsData(sources)")!!.data()
-        val videoUrl = check.substringAfter("sources: [\"").substringBefore("\"")
-        val videoHeaders = headers.newBuilder()
-            .add("Accept", "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5")
-            .add("Host", videoUrl.toHttpUrl().host)
-            .add("Referer", "https://uqload.co/")
-            .build()
-        return if (check.contains("sources")) {
-            listOf(Video(url, quality, videoUrl, headers = videoHeaders))
-        } else {
-            emptyList()
-        }
-    }
-}
diff --git a/src/fr/frenchanime/build.gradle b/src/fr/frenchanime/build.gradle
index 5d98f5a0c..fefc81867 100644
--- a/src/fr/frenchanime/build.gradle
+++ b/src/fr/frenchanime/build.gradle
@@ -10,6 +10,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
     implementation(project(':lib-okru-extractor'))
     implementation(project(':lib-sibnet-extractor'))
diff --git a/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt b/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt
index 6b8d40b20..4da7f1195 100644
--- a/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt
+++ b/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/FrenchAnime.kt
@@ -7,7 +7,6 @@ import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.fr.frenchanime.extractors.StreamHideExtractor
 import eu.kanade.tachiyomi.animeextension.fr.frenchanime.extractors.StreamVidExtractor
 import eu.kanade.tachiyomi.animeextension.fr.frenchanime.extractors.UpstreamExtractor
-import eu.kanade.tachiyomi.animeextension.fr.frenchanime.extractors.UqloadExtractor
 import eu.kanade.tachiyomi.animeextension.fr.frenchanime.extractors.VidoExtractor
 import eu.kanade.tachiyomi.animeextension.fr.frenchanime.extractors.VudeoExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -20,6 +19,7 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
+import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservableSuccess
@@ -251,7 +251,7 @@ class FrenchAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     }
                     source.contains("https://uqload") -> {
                         videoList.addAll(
-                            UqloadExtractor(client).videosFromUrl(source, headers),
+                            UqloadExtractor(client).videosFromUrl(source),
                         )
                     }
 
diff --git a/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/UqloadExtractor.kt b/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/UqloadExtractor.kt
deleted file mode 100644
index 5e5d0da47..000000000
--- a/src/fr/frenchanime/src/eu/kanade/tachiyomi/animeextension/fr/frenchanime/extractors/UqloadExtractor.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.fr.frenchanime.extractors
-
-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
-
-class UqloadExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers, quality: String = "Uqload"): List<Video> {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-        val check = document.selectFirst("script:containsData(sources)")!!.data()
-        val videoUrl = check.substringAfter("sources: [\"").substringBefore("\"")
-        val videoHeaders = headers.newBuilder()
-            .add("Accept", "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5")
-            .add("Host", videoUrl.toHttpUrl().host)
-            .add("Referer", "https://uqload.co/")
-            .build()
-        return if (check.contains("sources")) {
-            listOf(Video(url, quality, videoUrl, headers = videoHeaders))
-        } else {
-            emptyList()
-        }
-    }
-}
diff --git a/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt b/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt
index 2e1360f0d..466e567e5 100644
--- a/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt
+++ b/src/pt/flixei/src/eu/kanade/tachiyomi/animeextension/pt/flixei/Flixei.kt
@@ -27,7 +27,6 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import okhttp3.Headers
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
diff --git a/src/tr/anizm/build.gradle b/src/tr/anizm/build.gradle
index 2b58baf54..12a2a9d97 100644
--- a/src/tr/anizm/build.gradle
+++ b/src/tr/anizm/build.gradle
@@ -13,6 +13,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation(project(":lib-sendvid-extractor"))
     implementation(project(":lib-sibnet-extractor"))
     implementation(project(":lib-dood-extractor"))
diff --git a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt b/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
index dd48f064a..93495d869 100644
--- a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
+++ b/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.tr.anizm.AnizmFilters.applyFilterParams
-import eu.kanade.tachiyomi.animeextension.tr.anizm.extractors.UQLoadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -18,6 +17,7 @@ import eu.kanade.tachiyomi.lib.gdriveplayerextractor.GdrivePlayerExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
+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
@@ -206,7 +206,7 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
 
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val gdrivePlayerExtractor by lazy { GdrivePlayerExtractor(client) }
-    private val uqloadExtractor by lazy { UQLoadExtractor(client) }
+    private val uqloadExtractor by lazy { UqloadExtractor(client) }
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
     private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
     private val voeExtractor by lazy { VoeExtractor(client) }
@@ -230,7 +230,7 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
                 val newUrl = "https://gdriveplayer.to/embed2.php?link=$url"
                 gdrivePlayerExtractor.videosFromUrl(newUrl, "GdrivePlayer", headers)
             }
-            "uqload" in url -> uqloadExtractor.videoFromUrl(url)?.let(::listOf)
+            "uqload" in url -> uqloadExtractor.videosFromUrl(url)
             "voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf)
             else -> null
         } ?: emptyList()
diff --git a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/extractors/UQLoadExtractor.kt b/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/extractors/UQLoadExtractor.kt
deleted file mode 100644
index 095c3db01..000000000
--- a/src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/extractors/UQLoadExtractor.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.tr.anizm.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class UQLoadExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String = "uqload"): Video? {
-        val document = client.newCall(GET(url)).execute().use { it.asJsoup() }
-        val check = document.selectFirst("script:containsData(sources)")?.data()
-            ?: return null
-        val videoUrl = check.substringAfter("sources: [\"", "").substringBefore("\"", "")
-        if (videoUrl.isBlank()) return null
-        val videoHeaders = Headers.headersOf("Referer", url)
-        return Video(videoUrl, quality, videoUrl, videoHeaders)
-    }
-}
diff --git a/src/tr/turkanime/build.gradle b/src/tr/turkanime/build.gradle
index b661b4c22..f78bfa75a 100644
--- a/src/tr/turkanime/build.gradle
+++ b/src/tr/turkanime/build.gradle
@@ -5,6 +5,7 @@ plugins {
 }
 
 dependencies {
+    implementation(project(':lib-uqload-extractor'))
     implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
     implementation(project(":lib-cryptoaes"))
     implementation(project(":lib-dood-extractor"))
diff --git a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
index 4a38bf683..f37073bf1 100644
--- a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
+++ b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
@@ -12,7 +12,6 @@ import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.EmbedgramExtra
 import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.MVidooExtractor
 import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.MailRuExtractor
 import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.StreamVidExtractor
-import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.UqloadExtractor
 import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.VTubeExtractor
 import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.VudeoExtractor
 import eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors.WolfstreamExtractor
@@ -33,6 +32,7 @@ import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
 import eu.kanade.tachiyomi.lib.synchrony.Deobfuscator
+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.network.GET
@@ -306,7 +306,7 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     StreamVidExtractor(client).videosFromUrl(hosterLink, headers, prefix = "$subber: ")
                 }
                 "UQLOAD" -> {
-                    UqloadExtractor(client).videosFromUrl(hosterLink, headers, "$subber: Uqload")
+                    UqloadExtractor(client).videosFromUrl(hosterLink, "$subber:")
                 }
                 "VK" -> {
                     val vkUrl = "https://vk.com" + hosterLink.substringAfter("vk.com")
diff --git a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/extractors/UqloadExtractor.kt b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/extractors/UqloadExtractor.kt
deleted file mode 100644
index e775fce63..000000000
--- a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/extractors/UqloadExtractor.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.tr.turkanime.extractors
-
-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
-
-class UqloadExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, headers: Headers, quality: String = "Uqload"): List<Video> {
-        val document = client.newCall(GET(url)).execute().asJsoup()
-        val check = document.selectFirst("script:containsData(sources)")!!.data()
-        val videoUrl = check.substringAfter("sources: [\"").substringBefore("\"")
-        val videoHeaders = headers.newBuilder()
-            .add("Accept", "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5")
-            .add("Host", videoUrl.toHttpUrl().host)
-            .add("Referer", "https://uqload.co/")
-            .build()
-        return if (check.contains("sources")) {
-            listOf(Video(url, quality, videoUrl, headers = videoHeaders))
-        } else {
-            emptyList()
-        }
-    }
-}