From 05088707a008a94bbd2bb5e63170419ffee32c71 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Tue, 11 Oct 2022 06:03:49 -0300
Subject: [PATCH] Add support to shared extractors (#917)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .github/scripts/bump-versions.sh              | 49 +++++++++++++++
 .github/workflows/build_push.yml              | 13 ++++
 lib/dood-extractor/build.gradle.kts           | 24 ++++++++
 .../src/main/AndroidManifest.xml              |  2 +
 .../lib/doodextractor}/DoodExtractor.kt       | 28 +++++++--
 settings.gradle.kts                           |  6 +-
 src/ar/animelek/build.gradle                  |  6 +-
 .../animeextension/ar/animelek/AnimeLek.kt    |  2 +-
 .../ar/animelek/extractors/DoodExtractor.kt   | 43 -------------
 src/ar/animerco/build.gradle                  |  6 +-
 .../animeextension/ar/animerco/Animerco.kt    |  2 +-
 .../ar/animerco/extractors/DoodExtractor.kt   | 43 -------------
 src/ar/movizland/build.gradle                 |  6 +-
 .../animeextension/ar/movizland/Movizland.kt  |  2 +-
 .../ar/movizland/extractors/DoodExtractor.kt  | 43 -------------
 src/ar/shahid4u/build.gradle                  |  6 +-
 .../animeextension/ar/shahid4u/Shahid4U.kt    |  2 +-
 .../ar/shahid4u/extractors/DoodExtractor.kt   | 43 -------------
 src/ar/witanime/build.gradle                  |  6 +-
 .../animeextension/ar/witanime/WitAnime.kt    |  2 +-
 .../ar/witanime/extractors/DoodExtractor.kt   | 43 -------------
 src/de/aniflix/build.gradle                   |  6 +-
 .../animeextension/de/aniflix/Aniflix.kt      |  4 +-
 .../de/aniflix/extractors/DoodExtractor.kt    | 40 ------------
 src/de/animeshitai/build.gradle               |  6 +-
 .../de/animeshitai/AnimeShitai.kt             |  2 +-
 .../animeshitai/extractors/DoodExtractor.kt   | 42 -------------
 src/de/animetoast/build.gradle                |  6 +-
 .../de/animetoast/AnimeToast.kt               |  4 +-
 .../de/animetoast/extractors/DoodExtractor.kt | 40 ------------
 src/de/aniworld/build.gradle                  |  6 +-
 .../animeextension/de/aniworld/AniWorld.kt    |  2 +-
 .../de/aniworld/extractors/DoodExtractor.kt   | 42 -------------
 src/de/fireanime/build.gradle                 |  6 +-
 .../animeextension/de/fireanime/FireAnime.kt  |  4 +-
 .../de/fireanime/extractors/DoodExtractor.kt  | 40 ------------
 src/de/kinoking/build.gradle                  |  6 +-
 .../animeextension/de/kinoking/Kinoking.kt    |  5 +-
 .../de/kinoking/extractors/DoodExtractor.kt   | 61 -------------------
 src/de/serienstream/build.gradle              |  6 +-
 .../de/serienstream/Serienstream.kt           |  2 +-
 .../serienstream/extractors/DoodExtractor.kt  | 42 -------------
 src/de/streamcloud/build.gradle               |  6 +-
 .../de/streamcloud/StreamCloud.kt             |  4 +-
 .../streamcloud/extractors/DoodExtractor.kt   | 40 ------------
 src/en/animension/build.gradle                |  6 +-
 .../en/animension/Animension.kt               |  2 +-
 .../en/animension/extractors/DoodExtractor.kt | 43 -------------
 src/en/asianload/build.gradle                 |  6 +-
 .../animeextension/en/asianload/AsianLoad.kt  |  2 +-
 .../en/asianload/extractors/DoodExtractor.kt  | 43 -------------
 src/en/dopebox/build.gradle                   |  3 +-
 .../animeextension/en/dopebox/DopeBox.kt      |  2 +-
 .../en/dopebox/extractors/DoodExtractor.kt    | 43 -------------
 src/en/dramacool/build.gradle                 |  6 +-
 .../animeextension/en/dramacool/DramaCool.kt  |  2 +-
 .../en/dramacool/extractors/DoodExtractor.kt  | 43 -------------
 src/en/genoanime/build.gradle                 |  6 +-
 .../animeextension/en/genoanime/GenoAnime.kt  |  2 +-
 .../en/genoanime/extractors/DoodExtractor.kt  | 43 -------------
 src/en/gogoanime/build.gradle                 |  6 +-
 .../animeextension/en/gogoanime/GogoAnime.kt  |  2 +-
 .../en/gogoanime/extractors/DoodExtractor.kt  | 43 -------------
 src/en/kickassanime/build.gradle              |  6 +-
 .../en/kickassanime/KickAssAnime.kt           |  2 +-
 .../kickassanime/extractors/DoodExtractor.kt  | 43 -------------
 src/en/sflix/build.gradle                     |  3 +-
 .../animeextension/en/sflix/SFlix.kt          |  2 +-
 .../en/sflix/extractors/DoodExtractor.kt      | 43 -------------
 src/es/animeflv/build.gradle                  |  6 +-
 .../animeextension/es/animeflv/AnimeFlv.kt    |  4 +-
 .../es/animeflv/extractors/DoodExtractor.kt   | 43 -------------
 src/es/animelatinohd/build.gradle             |  6 +-
 .../es/animelatinohd/AnimeLatinoHD.kt         |  2 +-
 src/es/animeonlineninja/build.gradle          |  6 +-
 .../es/animeonlineninja/AnimeonlineNinja.kt   |  4 +-
 .../extractors/DoodExtractor.kt               | 43 -------------
 src/es/pelisflix/build.gradle                 |  6 +-
 .../es/pelisflix/PelisflixFactory.kt          |  4 +-
 .../es/pelisflix/extractors/DoodExtractor.kt  | 43 -------------
 src/es/pelisplushd/build.gradle               |  6 +-
 .../es/pelisplushd/Pelisplushd.kt             |  4 +-
 .../pelisplushd/extractors/DoodExtractor.kt   | 43 -------------
 src/fr/vostfree/build.gradle                  |  6 +-
 .../animeextension/fr/vostfree/Vostfree.kt    |  4 +-
 .../fr/vostfree/extractors/DoodExtractor.kt   | 40 ------------
 src/it/animeworld/build.gradle                |  6 +-
 .../it/animeworld/ANIMEWORLD.kt               |  2 +-
 .../it/animeworld/extractors/DoodExtractor.kt | 43 -------------
 src/pt/animesvision/build.gradle              |  4 +-
 .../pt/animesvision/AnimesVision.kt           |  2 +-
 .../animesvision/extractors/DoodExtractor.kt  | 43 -------------
 92 files changed, 291 insertions(+), 1280 deletions(-)
 create mode 100755 .github/scripts/bump-versions.sh
 create mode 100644 lib/dood-extractor/build.gradle.kts
 create mode 100644 lib/dood-extractor/src/main/AndroidManifest.xml
 rename {src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors => lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor}/DoodExtractor.kt (62%)
 delete mode 100644 src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt
 delete mode 100644 src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt
 delete mode 100644 src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/extractors/DoodExtractor.kt
 delete mode 100644 src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/extractors/DoodExtractor.kt
 delete mode 100755 src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt
 delete mode 100644 src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt
 delete mode 100644 src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt
 delete mode 100644 src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/extractors/DoodExtractor.kt
 delete mode 100644 src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/extractors/DoodExtractor.kt
 delete mode 100644 src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt
 delete mode 100644 src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/extractors/DoodExtractor.kt
 delete mode 100644 src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/extractors/DoodExtractor.kt
 delete mode 100644 src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/extractors/DoodExtractor.kt
 delete mode 100644 src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/DoodExtractor.kt
 delete mode 100644 src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt
 delete mode 100644 src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/extractors/DoodExtractor.kt
 delete mode 100644 src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt
 delete mode 100644 src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt
 delete mode 100644 src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
 delete mode 100644 src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/DoodExtractor.kt
 delete mode 100644 src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/extractors/DoodExtractor.kt
 delete mode 100644 src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt
 delete mode 100644 src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt
 delete mode 100644 src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/extractors/DoodExtractor.kt
 delete mode 100644 src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt
 delete mode 100644 src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt
 delete mode 100644 src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt
 delete mode 100644 src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt

diff --git a/.github/scripts/bump-versions.sh b/.github/scripts/bump-versions.sh
new file mode 100755
index 000000000..2652fa7fb
--- /dev/null
+++ b/.github/scripts/bump-versions.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+versionStr="extVersionCode ="
+
+getVersion() {
+    # cut -d "=" -f 2 -> string.split("=")[1]
+    # "extVersionCode = 6" -> ["extVersionCode ", " 6"] -> " 6" -> "6"
+    grep "$versionStr" "$1" | cut -d "=" -f 2 | cut -d " " -f 2
+}
+
+bumpVersion() {
+    local file=$1
+    local old_version=$(getVersion $file)
+    local new_version=$((old_version + 1))
+
+    echo -e "\n$file: $old_version -> $new_version\n"
+    sed -i "s/$versionStr $old_version/$versionStr $new_version/" $file
+}
+
+findAndBump() {
+    local bumpedFiles=""
+    for lib in $@; do
+        for file in $(grep -l -R ":lib-$lib" --include "build.gradle"); do
+            # prevent bumping the same extension multiple times
+            if [[ ! $bumpedFiles =~ ( |^)$file( |$) ]]; then
+                bumpedFiles+="$file "
+                bumpVersion $file
+            fi
+        done
+    done
+    commitChanges $bumpedFiles
+}
+
+commitChanges() {
+    # this will NOT trigger another workflow, because it will use $GITHUB_TOKEN.
+    # so the build-action will run fine with the bumped-up extensions
+    if [[ -n "$@" ]]; then
+        git config --global user.email "github-actions[bot]@users.noreply.github.com"
+        git config --global user.name "github-actions[bot]"
+        git add $@
+        git commit -m "Mass-bump on extensions"
+        git push
+    fi
+}
+
+# lib/cryptoaes/build.gradle.kts -> lib/cryptoaes -> cryptoaes
+modified=$(echo $@ | tr " " "\n" | grep -Eo "^lib/\w+" | sort | uniq | cut -c 5-)
+if [[ -n "$modified" ]]; then
+    findAndBump $modified
+fi
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index a92c27352..c13cf62a1 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -29,6 +29,19 @@ jobs:
       - name: Clone repo
         uses: actions/checkout@v3
 
+      - name: Find lib changes
+        id: modified-libs
+        uses: tj-actions/changed-files@v32
+        with:
+          files: lib/**
+          files_ignore: lib/**.md
+          files_separator: " "
+        # This step is going to commit, but this will not trigger another workflow.
+      - name: Bump extensions that uses a modified lib
+        if: steps.modified-libs.outputs.any_changed == 'true'
+        run: |
+          ./.github/scripts/bump-versions.sh ${{ steps.modified-libs.outputs.all_changed_files }}
+
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
diff --git a/lib/dood-extractor/build.gradle.kts b/lib/dood-extractor/build.gradle.kts
new file mode 100644
index 000000000..1c2f5bc51
--- /dev/null
+++ b/lib/dood-extractor/build.gradle.kts
@@ -0,0 +1,24 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+}
+
+android {
+    compileSdk = AndroidConfig.compileSdk
+
+    defaultConfig {
+        minSdk = AndroidConfig.minSdk
+        targetSdk = AndroidConfig.targetSdk
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compileOnly(libs.kotlin.stdlib)
+    compileOnly(libs.okhttp)
+    compileOnly(libs.aniyomi.lib)
+}
+// BUMPS: 0
\ No newline at end of file
diff --git a/lib/dood-extractor/src/main/AndroidManifest.xml b/lib/dood-extractor/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..fd4aec6b0
--- /dev/null
+++ b/lib/dood-extractor/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.lib.doodextractor" />
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/DoodExtractor.kt b/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt
similarity index 62%
rename from src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/DoodExtractor.kt
rename to lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt
index 66a832901..6c4ca1223 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/extractors/DoodExtractor.kt
+++ b/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.animeextension.es.animelatinohd.extractors
+package eu.kanade.tachiyomi.lib.doodextractor
 
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
@@ -6,10 +6,19 @@ import okhttp3.Headers
 import okhttp3.OkHttpClient
 
 class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
+
+    fun videoFromUrl(
+        url: String,
+        quality: String? = null,
+        redirect: Boolean = true
+    ): Video? {
+        val newQuality = quality ?: "Doodstream" + if(redirect) " mirror" else ""
+        
         return try {
             val response = client.newCall(GET(url)).execute()
-            val doodTld = url.substringAfter("https://dood.").substringBefore("/")
+            val newUrl = if(redirect) response.request.url.toString() else url
+            
+            val doodTld = newUrl.substringAfter("https://dood.").substringBefore("/")
             val content = response.body!!.string()
             if (!content.contains("'/pass_md5/")) return null
             val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
@@ -19,16 +28,25 @@ class DoodExtractor(private val client: OkHttpClient) {
             val videoUrlStart = client.newCall(
                 GET(
                     "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", url)
+                    Headers.headersOf("referer", newUrl)
                 )
             ).execute().body!!.string()
             val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
+            Video(newUrl, newQuality, videoUrl, headers = doodHeaders(doodTld))
         } catch (e: Exception) {
             null
         }
     }
 
+    fun videosFromUrl(
+        url: String,
+        quality: String? = null,
+        redirect: Boolean = true
+    ): List<Video> {
+        val video = videoFromUrl(url, quality, redirect)
+        return video?.let { listOf(it) } ?: emptyList<Video>()
+    }
+
     private fun getRandomString(length: Int = 10): String {
         val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
         return (1..length)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a01f2ac36..ff07773f8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,9 @@
 include(":core")
 
-include(":lib-dataimage")
-project(":lib-dataimage").projectDir = File("lib/dataimage")
+listOf("dataimage", "dood-extractor").forEach {
+    include(":lib-$it")
+    project(":lib-$it").projectDir = File("lib/$it")
+}
 
 if (System.getenv("CI") == null || System.getenv("CI_MODULE_GEN") == "true") {
     // Local development (full project build)
diff --git a/src/ar/animelek/build.gradle b/src/ar/animelek/build.gradle
index e4c4f8951..34d03ef5d 100644
--- a/src/ar/animelek/build.gradle
+++ b/src/ar/animelek/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'AnimeLek'
     pkgNameSuffix = 'ar.animelek'
     extClass = '.AnimeLek'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt
index e7d0cc20d..938a58abb 100644
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt
+++ b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/AnimeLek.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.ar.animelek.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.ar.animelek.extractors.OkruExtractor
 import eu.kanade.tachiyomi.animeextension.ar.animelek.extractors.SharedExtractor
 import eu.kanade.tachiyomi.animeextension.ar.animelek.extractors.StreamSBExtractor
diff --git a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt b/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt
deleted file mode 100644
index 94e686249..000000000
--- a/src/ar/animelek/src/eu/kanade/tachiyomi/animeextension/ar/animelek/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.animelek.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        // if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        // val newQuality = "Doodstream mirror"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/ar/animerco/build.gradle b/src/ar/animerco/build.gradle
index cb0a6828a..837a00e09 100644
--- a/src/ar/animerco/build.gradle
+++ b/src/ar/animerco/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'Animerco'
     pkgNameSuffix = 'ar.animerco'
     extClass = '.Animerco'
-    extVersionCode = 12
+    extVersionCode = 13
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
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 08d69a46c..8568404d1 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
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.MpforuploadExtractor
 import eu.kanade.tachiyomi.animeextension.ar.animerco.extractors.SharedExtractor
diff --git a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt b/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt
deleted file mode 100644
index 28d7a82d2..000000000
--- a/src/ar/animerco/src/eu/kanade/tachiyomi/animeextension/ar/animerco/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.animerco.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/ar/movizland/build.gradle b/src/ar/movizland/build.gradle
index 774632b3c..bbed31b54 100644
--- a/src/ar/movizland/build.gradle
+++ b/src/ar/movizland/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'موفيزلاند'
     pkgNameSuffix = 'ar.movizland'
     extClass = '.Movizland'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/Movizland.kt b/src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/Movizland.kt
index e1c7d8cbc..ff9472402 100644
--- a/src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/Movizland.kt
+++ b/src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/Movizland.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.ar.movizland.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.ar.movizland.extractors.LinkboxExtractor
 import eu.kanade.tachiyomi.animeextension.ar.movizland.extractors.MoshahdaExtractor
 import eu.kanade.tachiyomi.animeextension.ar.movizland.extractors.StreamTapeExtractor
diff --git a/src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/extractors/DoodExtractor.kt b/src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/extractors/DoodExtractor.kt
deleted file mode 100644
index 76560ae9a..000000000
--- a/src/ar/movizland/src/eu/kanade/tachiyomi/animeextension/ar/movizland/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.movizland.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream: 1080p"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/ar/shahid4u/build.gradle b/src/ar/shahid4u/build.gradle
index 1b39f7b6f..2aca81403 100644
--- a/src/ar/shahid4u/build.gradle
+++ b/src/ar/shahid4u/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'شاهد فور يو'
     pkgNameSuffix = 'ar.shahid4u'
     extClass = '.Shahid4U'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/Shahid4U.kt b/src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/Shahid4U.kt
index d864c163c..82b316568 100644
--- a/src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/Shahid4U.kt
+++ b/src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/Shahid4U.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.ar.shahid4u.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.ar.shahid4u.extractors.OkruExtractor
 import eu.kanade.tachiyomi.animeextension.ar.shahid4u.extractors.UQLoadExtractor
 import eu.kanade.tachiyomi.animeextension.ar.shahid4u.extractors.VidBomExtractor
diff --git a/src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/extractors/DoodExtractor.kt b/src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/extractors/DoodExtractor.kt
deleted file mode 100644
index 929dc9688..000000000
--- a/src/ar/shahid4u/src/eu/kanade/tachiyomi/animeextension/ar/shahid4u/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.shahid4u.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream: 1080p"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/ar/witanime/build.gradle b/src/ar/witanime/build.gradle
index f399daa3c..b2d736edb 100644
--- a/src/ar/witanime/build.gradle
+++ b/src/ar/witanime/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'WIT ANIME'
     pkgNameSuffix = 'ar.witanime'
     extClass = '.WitAnime'
-    extVersionCode = 20
+    extVersionCode = 21
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
index 7b6ebf165..449ae9c69 100755
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.ar.witanime.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.ar.witanime.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.ar.witanime.extractors.SoraPlayExtractor
 import eu.kanade.tachiyomi.animeextension.ar.witanime.extractors.StreamSBExtractor
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt
deleted file mode 100755
index cc3f1facf..000000000
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.ar.witanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        // val newQuality = "Doodstream mirror"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/aniflix/build.gradle b/src/de/aniflix/build.gradle
index a62e5a807..b5c8672f5 100644
--- a/src/de/aniflix/build.gradle
+++ b/src/de/aniflix/build.gradle
@@ -6,8 +6,12 @@ ext {
     extName = 'Aniflix'
     pkgNameSuffix = 'de.aniflix'
     extClass = '.Aniflix'
-    extVersionCode = 17
+    extVersionCode = 18
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
index 5829eeff0..f18fd7bef 100644
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
+++ b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.AnimeDto
 import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.Episode
 import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.Release
 import eu.kanade.tachiyomi.animeextension.de.aniflix.dto.Season
-import eu.kanade.tachiyomi.animeextension.de.aniflix.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.de.aniflix.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animeextension.de.aniflix.extractors.StreamlareExtractor
 import eu.kanade.tachiyomi.animeextension.de.aniflix.extractors.VoeExtractor
@@ -198,7 +198,7 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
             val hosterSelection = preferences.getStringSet("hoster_selection", setOf("dood", "stape", "voe", "slare"))
             when {
                 link.contains("https://dood") && hosterSelection?.contains("dood") == true -> {
-                    val video = try { DoodExtractor(client).videoFromUrl(link, quality) } catch (e: Exception) { null }
+                    val video = try { DoodExtractor(client).videoFromUrl(link, quality, false) } catch (e: Exception) { null }
                     if (video != null) {
                         videoList.add(video)
                     }
diff --git a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt b/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt
deleted file mode 100644
index 8f3325d2f..000000000
--- a/src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.aniflix.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/animeshitai/build.gradle b/src/de/animeshitai/build.gradle
index d79a08d03..66d58ccc3 100644
--- a/src/de/animeshitai/build.gradle
+++ b/src/de/animeshitai/build.gradle
@@ -6,8 +6,12 @@ ext {
     extName = 'Anime Shitai'
     pkgNameSuffix = 'de.animeshitai'
     extClass = '.AnimeShitai'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/AnimeShitai.kt b/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/AnimeShitai.kt
index b77e0e876..5a62a6bb9 100644
--- a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/AnimeShitai.kt
+++ b/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/AnimeShitai.kt
@@ -7,7 +7,7 @@ import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.de.animeshitai.ASFilters.applyFilterParams
-import eu.kanade.tachiyomi.animeextension.de.animeshitai.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.de.animeshitai.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animeextension.de.animeshitai.model.ASAnime
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
diff --git a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt b/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt
deleted file mode 100644
index a836b7582..000000000
--- a/src/de/animeshitai/src/eu/kanade/tachiyomi/animeextension/de/animeshitai/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.animeshitai.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/animetoast/build.gradle b/src/de/animetoast/build.gradle
index 01cb9b2d4..5b98ba112 100644
--- a/src/de/animetoast/build.gradle
+++ b/src/de/animetoast/build.gradle
@@ -6,8 +6,12 @@ ext {
     extName = 'AnimeToast'
     pkgNameSuffix = 'de.animetoast'
     extClass = '.AnimeToast'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
index ebda30ead..cd6e8be04 100644
--- a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
+++ b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.de.animetoast.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.de.animetoast.extractors.VoeExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -126,7 +126,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     when {
                         link.contains("https://dood") && hosterSelection?.contains("dood") == true -> {
                             val quality = "DoodStream"
-                            val video = DoodExtractor(client).videoFromUrl(link, quality)
+                            val video = DoodExtractor(client).videoFromUrl(link, quality, false)
                             if (video != null) {
                                 videoList.add(video)
                             }
diff --git a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/extractors/DoodExtractor.kt b/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/extractors/DoodExtractor.kt
deleted file mode 100644
index a494137c0..000000000
--- a/src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.animetoast.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, null, doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/aniworld/build.gradle b/src/de/aniworld/build.gradle
index 80c8dceae..2a86b2301 100644
--- a/src/de/aniworld/build.gradle
+++ b/src/de/aniworld/build.gradle
@@ -6,8 +6,12 @@ ext {
     extName = 'AniWorld (experimental)'
     pkgNameSuffix = 'de.aniworld'
     extClass = '.AniWorld'
-    extVersionCode = 6
+    extVersionCode = 7
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
index aba14a479..9f18faaa2 100644
--- a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
+++ b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
@@ -9,7 +9,7 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.de.aniworld.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.de.aniworld.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animeextension.de.aniworld.extractors.VidozaExtractor
 import eu.kanade.tachiyomi.animeextension.de.aniworld.extractors.VoeExtractor
diff --git a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/extractors/DoodExtractor.kt b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/extractors/DoodExtractor.kt
deleted file mode 100644
index 030e61ac5..000000000
--- a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.aniworld.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/fireanime/build.gradle b/src/de/fireanime/build.gradle
index f2335a41c..25d2c2a13 100644
--- a/src/de/fireanime/build.gradle
+++ b/src/de/fireanime/build.gradle
@@ -6,9 +6,13 @@ ext {
     extName = 'FireAnime'
     pkgNameSuffix = 'de.fireanime'
     extClass = '.FireAnime'
-    extVersionCode = 5
+    extVersionCode = 6
     libVersion = '13'
     containsNsfw = true
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/FireAnime.kt b/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/FireAnime.kt
index ef6e0a5a7..fe5062e2b 100644
--- a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/FireAnime.kt
+++ b/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/FireAnime.kt
@@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.animeextension.de.fireanime.dto.EpisodeListingWrapper
 import eu.kanade.tachiyomi.animeextension.de.fireanime.dto.EpisodeSourcesDto
 import eu.kanade.tachiyomi.animeextension.de.fireanime.dto.HosterSourceDto
 import eu.kanade.tachiyomi.animeextension.de.fireanime.dto.VideoLinkDto
-import eu.kanade.tachiyomi.animeextension.de.fireanime.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.de.fireanime.extractors.FireCdnExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -214,7 +214,7 @@ class FireAnime : ConfigurableAnimeSource, AnimeHttpSource() {
                 }
                 isSource(FAConstants.NAME_DOOD) -> {
                     val video = try {
-                        DoodExtractor(client).videoFromUrl(link, quality)
+                        DoodExtractor(client).videoFromUrl(link, quality, false)
                     } catch (e: Exception) {
                         null
                     }
diff --git a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt b/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt
deleted file mode 100644
index e348b9501..000000000
--- a/src/de/fireanime/src/eu/kanade/tachiyomi/animeextension/de/fireanime/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.fireanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/kinoking/build.gradle b/src/de/kinoking/build.gradle
index 1a8d747dd..2fac6dd6c 100644
--- a/src/de/kinoking/build.gradle
+++ b/src/de/kinoking/build.gradle
@@ -6,8 +6,12 @@ ext {
     extName = 'Kinoking'
     pkgNameSuffix = 'de.kinoking'
     extClass = '.Kinoking'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/Kinoking.kt b/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/Kinoking.kt
index 158aba041..e2372c2f8 100644
--- a/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/Kinoking.kt
+++ b/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/Kinoking.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.de.kinoking.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.de.kinoking.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animeextension.de.kinoking.extractors.VoeExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@@ -134,7 +134,8 @@ class Kinoking : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 }
                 link.contains("https://dood.") || link.contains("https://doodstream.") && hosterSelection?.contains("dood") == true -> {
                     val quality = "Doodstream"
-                    val video = DoodExtractor(client).videoFromUrl(link, quality)
+                    val redirect = !link.contains("https://doodstream")
+                    val video = DoodExtractor(client).videoFromUrl(link, quality, redirect)
                     if (video != null) {
                         videoList.add(video)
                     }
diff --git a/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/extractors/DoodExtractor.kt b/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/extractors/DoodExtractor.kt
deleted file mode 100644
index 4da6207e8..000000000
--- a/src/de/kinoking/src/eu/kanade/tachiyomi/animeextension/de/kinoking/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.kinoking.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        if (url.contains("https://doodstream")) {
-            val newurl = client.newCall(GET(url)).execute().request.url.toString()
-            val response = client.newCall(GET(newurl)).execute()
-            val doodTld = newurl.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return null
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", newurl)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-            return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-        } else {
-            val response = client.newCall(GET(url)).execute()
-            val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return null
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", url)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-            return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-        }
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/serienstream/build.gradle b/src/de/serienstream/build.gradle
index b589acf48..810ca0246 100644
--- a/src/de/serienstream/build.gradle
+++ b/src/de/serienstream/build.gradle
@@ -6,8 +6,12 @@ ext {
     extName = 'Serienstream'
     pkgNameSuffix = 'de.serienstream'
     extClass = '.Serienstream'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
index 1b28e31fa..8e1b5a196 100644
--- a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
+++ b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
@@ -9,7 +9,7 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.de.serienstream.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.de.serienstream.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animeextension.de.serienstream.extractors.VoeExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
diff --git a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/extractors/DoodExtractor.kt b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/extractors/DoodExtractor.kt
deleted file mode 100644
index 26d83c1e0..000000000
--- a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.serienstream.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/de/streamcloud/build.gradle b/src/de/streamcloud/build.gradle
index a7dcdca09..361559ae0 100644
--- a/src/de/streamcloud/build.gradle
+++ b/src/de/streamcloud/build.gradle
@@ -6,8 +6,12 @@ ext {
     extName = 'StreamCloud'
     pkgNameSuffix = 'de.streamcloud'
     extClass = '.StreamCloud'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt b/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
index a60c90fd3..ae3495398 100644
--- a/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
+++ b/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/StreamCloud.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.de.streamcloud.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -115,7 +115,7 @@ class StreamCloud : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 li.text().contains("doodstream.com") && hosterSelection?.contains("dood") == true -> {
                     val quality = "Doodstream"
                     val link = "https:" + li.attr("data-link")
-                    val video = DoodExtractor(client).videoFromUrl(link, quality)
+                    val video = DoodExtractor(client).videoFromUrl(link, quality, false)
                     if (video != null) {
                         videoList.add(video)
                     }
diff --git a/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/extractors/DoodExtractor.kt b/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/extractors/DoodExtractor.kt
deleted file mode 100644
index f39feb117..000000000
--- a/src/de/streamcloud/src/eu/kanade/tachiyomi/animeextension/de/streamcloud/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.streamcloud.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/animension/build.gradle b/src/en/animension/build.gradle
index ed64ceb15..a948411b0 100644
--- a/src/en/animension/build.gradle
+++ b/src/en/animension/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'Animension'
     pkgNameSuffix = 'en.animension'
     extClass = '.Animension'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt b/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt
index 440f3be29..d6e5902b1 100644
--- a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt
+++ b/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/Animension.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.animension.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.animension.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.en.animension.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
diff --git a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/DoodExtractor.kt b/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/DoodExtractor.kt
deleted file mode 100644
index e392e8bec..000000000
--- a/src/en/animension/src/eu/kanade/tachiyomi/animeextension/en/animension/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.animension.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/asianload/build.gradle b/src/en/asianload/build.gradle
index f1945be2f..0b27600a6 100644
--- a/src/en/asianload/build.gradle
+++ b/src/en/asianload/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'AsianLoad'
     pkgNameSuffix = 'en.asianload'
     extClass = '.AsianLoad'
-    extVersionCode = 16
+    extVersionCode = 17
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt
index fea649c1a..4bd4a305c 100644
--- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt
+++ b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/AsianLoad.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animeextension.en.asianload.extractors.StreamTapeExtractor
diff --git a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt b/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt
deleted file mode 100644
index c2c0bb9f7..000000000
--- a/src/en/asianload/src/eu/kanade/tachiyomi/animeextension/en/asianload/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.asianload.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/dopebox/build.gradle b/src/en/dopebox/build.gradle
index f7560fab2..7b628ce3f 100644
--- a/src/en/dopebox/build.gradle
+++ b/src/en/dopebox/build.gradle
@@ -5,12 +5,13 @@ ext {
     extName = 'DopeBox'
     pkgNameSuffix = 'en.dopebox'
     extClass = '.DopeBox'
-    extVersionCode = 11
+    extVersionCode = 12
     libVersion = '13'
 }
 
 dependencies {
     compileOnly libs.bundles.coroutines
+    implementation(project(':lib-dood-extractor'))
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt b/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt
index 455776bfd..d30e2d014 100644
--- a/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt
+++ b/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/DopeBox.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.dopebox.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.dopebox.extractors.DopeBoxExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
diff --git a/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/extractors/DoodExtractor.kt b/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/extractors/DoodExtractor.kt
deleted file mode 100644
index 518907ba7..000000000
--- a/src/en/dopebox/src/eu/kanade/tachiyomi/animeextension/en/dopebox/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.dopebox.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "DoodStream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/dramacool/build.gradle b/src/en/dramacool/build.gradle
index ee3337aa0..60e4daf33 100644
--- a/src/en/dramacool/build.gradle
+++ b/src/en/dramacool/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'DramaCool'
     pkgNameSuffix = 'en.dramacool'
     extClass = '.DramaCool'
-    extVersionCode = 22
+    extVersionCode = 23
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt
index 092cb7191..58e04ac80 100644
--- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt
+++ b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt
@@ -6,7 +6,7 @@ import android.widget.Toast
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.AppInfo
-import eu.kanade.tachiyomi.animeextension.en.dramacool.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.dramacool.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.en.dramacool.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animeextension.en.dramacool.extractors.StreamTapeExtractor
diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt
deleted file mode 100644
index e854936aa..000000000
--- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.dramacool.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/genoanime/build.gradle b/src/en/genoanime/build.gradle
index f91dda927..f6a338bc2 100644
--- a/src/en/genoanime/build.gradle
+++ b/src/en/genoanime/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'GenoAnime'
     pkgNameSuffix = 'en.genoanime'
     extClass = '.GenoAnime'
-    extVersionCode = 16
+    extVersionCode = 17
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt
index e954f4868..9dd593bd0 100644
--- a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt
+++ b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/GenoAnime.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.genoanime.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.genoanime.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.en.genoanime.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animeextension.en.genoanime.extractors.StreamTapeExtractor
diff --git a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt b/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt
deleted file mode 100644
index ff1c5cd45..000000000
--- a/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.genoanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/gogoanime/build.gradle b/src/en/gogoanime/build.gradle
index 783f559da..cc7108ee8 100644
--- a/src/en/gogoanime/build.gradle
+++ b/src/en/gogoanime/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'Gogoanime'
     pkgNameSuffix = 'en.gogoanime'
     extClass = '.GogoAnime'
-    extVersionCode = 48
+    extVersionCode = 49
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
index e282eafe0..2af864de6 100644
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
+++ b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/GogoAnime.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors.GogoCdnExtractor
 import eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
diff --git a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt b/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
deleted file mode 100644
index 976fb4440..000000000
--- a/src/en/gogoanime/src/eu/kanade/tachiyomi/animeextension/en/gogoanime/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.gogoanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(serverUrl: String): List<Video> {
-        try {
-            val response = client.newCall(GET(serverUrl)).execute()
-            val doodTld = serverUrl.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return emptyList()
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", serverUrl)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            return listOf(Video(serverUrl, "Doodstream", videoUrl, headers = doodHeaders(doodTld)))
-        } catch (e: Exception) {
-            return emptyList()
-        }
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/kickassanime/build.gradle b/src/en/kickassanime/build.gradle
index 83e76b3d7..7b125179e 100644
--- a/src/en/kickassanime/build.gradle
+++ b/src/en/kickassanime/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'KickAssAnime'
     pkgNameSuffix = 'en.kickassanime'
     extClass = '.KickAssAnime'
-    extVersionCode = 9
+    extVersionCode = 10
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
index 79be7146b..90aee0381 100644
--- a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
+++ b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/KickAssAnime.kt
@@ -6,7 +6,7 @@ import android.net.Uri
 import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.kickassanime.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.kickassanime.extractors.GogoCdnExtractor
 import eu.kanade.tachiyomi.animeextension.en.kickassanime.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
diff --git a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/DoodExtractor.kt b/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/DoodExtractor.kt
deleted file mode 100644
index 0f20004a0..000000000
--- a/src/en/kickassanime/src/eu/kanade/tachiyomi/animeextension/en/kickassanime/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.kickassanime.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(serverUrl: String): List<Video> {
-        try {
-            val response = client.newCall(GET(serverUrl)).execute()
-            val doodTld = serverUrl.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return emptyList()
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", serverUrl)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            return listOf(Video(serverUrl, "Doodstream", videoUrl, headers = doodHeaders(doodTld)))
-        } catch (e: Exception) {
-            return emptyList()
-        }
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/en/sflix/build.gradle b/src/en/sflix/build.gradle
index a00979b4d..7e766bb61 100644
--- a/src/en/sflix/build.gradle
+++ b/src/en/sflix/build.gradle
@@ -5,12 +5,13 @@ ext {
     extName = 'Sflix'
     pkgNameSuffix = 'en.sflix'
     extClass = '.SFlix'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '13'
 }
 
 dependencies {
     compileOnly libs.bundles.coroutines
+    implementation(project(':lib-dood-extractor'))
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt b/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt
index 436c92a04..766d9bfa2 100644
--- a/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt
+++ b/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/SFlix.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.sflix.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.en.sflix.extractors.SFlixExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
diff --git a/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/extractors/DoodExtractor.kt b/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/extractors/DoodExtractor.kt
deleted file mode 100644
index bc2d1da78..000000000
--- a/src/en/sflix/src/eu/kanade/tachiyomi/animeextension/en/sflix/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.sflix.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "DoodStream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle
index 372512197..bcb5f8d7d 100644
--- a/src/es/animeflv/build.gradle
+++ b/src/es/animeflv/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'AnimeFLV'
     pkgNameSuffix = 'es.animeflv'
     extClass = '.AnimeFlv'
-    extVersionCode = 29
+    extVersionCode = 30
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
index 08309fdae..fcbf25eaf 100644
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
+++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.OkruExtractor
 import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.StreamSBExtractor
@@ -137,7 +137,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                         if (video != null) videoList.add(video)
                     }
                     if (quality == "Doodstream") {
-                        val video = DoodExtractor(client).videoFromUrl(url, "DoodStream")
+                        val video = DoodExtractor(client).videoFromUrl(url, "DoodStream", false)
                         if (video != null) videoList.add(video)
                     }
                     if (quality == "Okru") {
diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt
deleted file mode 100644
index adf717b30..000000000
--- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.animeflv.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        return try {
-            val response = client.newCall(GET(url)).execute()
-            val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return null
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", url)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/es/animelatinohd/build.gradle b/src/es/animelatinohd/build.gradle
index 7c845cb3c..f120bfc2f 100644
--- a/src/es/animelatinohd/build.gradle
+++ b/src/es/animelatinohd/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'AnimeLatinoHD'
     pkgNameSuffix = 'es.animelatinohd'
     extClass = '.AnimeLatinoHD'
-    extVersionCode = 7
+    extVersionCode = 8
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
index 7e8d4f987..b145ae73c 100644
--- a/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
+++ b/src/es/animelatinohd/src/eu/kanade/tachiyomi/animeextension/es/animelatinohd/AnimeLatinoHD.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.animelatinohd.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.es.animelatinohd.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.es.animelatinohd.extractors.OkruExtractor
 import eu.kanade.tachiyomi.animeextension.es.animelatinohd.extractors.SolidFilesExtractor
diff --git a/src/es/animeonlineninja/build.gradle b/src/es/animeonlineninja/build.gradle
index a72e6e40b..215a8e348 100644
--- a/src/es/animeonlineninja/build.gradle
+++ b/src/es/animeonlineninja/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'AnimeonlineNinja'
     pkgNameSuffix = 'es.animeonlineninja'
     extClass = '.AnimeonlineNinja'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt
index b8cabe9cc..ba39f0265 100644
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt
+++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.JsUnpacker
 import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.StreamSBExtractor
@@ -147,7 +147,7 @@ class AnimeonlineNinja : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 StreamTapeExtractor(client).videoFromUrl(serverUrl, "$lang StreamTape")?.let { it1 -> videos.add(it1) }
             }
             serverUrl.contains("dood") && lang.contains(langSelect) -> {
-                DoodExtractor(client).videoFromUrl(serverUrl, "$lang DoodStream")?.let { it1 -> videos.add(it1) }
+                DoodExtractor(client).videoFromUrl(serverUrl, "$lang DoodStream", false)?.let { it1 -> videos.add(it1) }
             }
             serverUrl.contains("sb") && lang.contains(langSelect) -> {
                 try {
diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt
deleted file mode 100644
index c76f29553..000000000
--- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        return try {
-            val response = client.newCall(GET(url)).execute()
-            val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return null
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", url)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/es/pelisflix/build.gradle b/src/es/pelisflix/build.gradle
index 59003687e..f6d2ded5a 100644
--- a/src/es/pelisflix/build.gradle
+++ b/src/es/pelisflix/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'Pelisflix'
     pkgNameSuffix = 'es.pelisflix'
     extClass = '.PelisflixFactory'
-    extVersionCode = 5
+    extVersionCode = 6
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
index 4b4707ff0..c3b42454b 100644
--- a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
+++ b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/PelisflixFactory.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.pelisflix.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.es.pelisflix.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.es.pelisflix.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animesource.AnimeSource
@@ -60,7 +60,7 @@ class SeriesflixClass : Pelisflix("Seriesflix", "https://seriesflix.video") {
                 }
             }
             if (serverUrl.contains("doodstream")) {
-                val video = DoodExtractor(client).videoFromUrl(serverUrl.replace("https://doodstream.com", "https://dood.wf"), lang + "DoodStream")
+                val video = DoodExtractor(client).videoFromUrl(serverUrl.replace("https://doodstream.com", "https://dood.wf"), lang + "DoodStream", false)
                 if (video != null) videoList.add(video)
             }
             if (serverUrl.contains("streamtape")) {
diff --git a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/extractors/DoodExtractor.kt b/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/extractors/DoodExtractor.kt
deleted file mode 100644
index 96e8f8552..000000000
--- a/src/es/pelisflix/src/eu/kanade/tachiyomi/animeextension/es/pelisflix/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.pelisflix.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        return try {
-            val response = client.newCall(GET(url)).execute()
-            val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return null
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", url)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/es/pelisplushd/build.gradle b/src/es/pelisplushd/build.gradle
index 1ebcab3a8..6c05e61d1 100644
--- a/src/es/pelisplushd/build.gradle
+++ b/src/es/pelisplushd/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'Pelisplushd'
     pkgNameSuffix = 'es.pelisplushd'
     extClass = '.Pelisplushd'
-    extVersionCode = 19
+    extVersionCode = 20
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
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 9e252be46..6ca3452b1 100644
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
+++ b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
@@ -5,7 +5,7 @@ import android.content.SharedPreferences
 import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.FembedExtractor
 import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors.StreamTapeExtractor
@@ -216,7 +216,7 @@ class Pelisplushd : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             }
             "doodstream" -> {
                 val url2 = url.replace("https://doodstream.com/e/", "https://dood.to/e/")
-                val video = DoodExtractor(client).videoFromUrl(url2, "DoodStream")
+                val video = DoodExtractor(client).videoFromUrl(url2, "DoodStream", false)
                 if (video != null) {
                     videoList.add(video)
                 }
diff --git a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt b/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt
deleted file mode 100644
index 47f20930d..000000000
--- a/src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.pelisplushd.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        return try {
-            val response = client.newCall(GET(url)).execute()
-            val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-            val content = response.body!!.string()
-            if (!content.contains("'/pass_md5/")) return null
-            val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-            val token = md5.substringAfterLast("/")
-            val randomString = getRandomString()
-            val expiry = System.currentTimeMillis()
-            val videoUrlStart = client.newCall(
-                GET(
-                    "https://dood.$doodTld/pass_md5/$md5",
-                    Headers.headersOf("referer", url)
-                )
-            ).execute().body!!.string()
-            val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-            Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/fr/vostfree/build.gradle b/src/fr/vostfree/build.gradle
index c433ac991..12f90583e 100644
--- a/src/fr/vostfree/build.gradle
+++ b/src/fr/vostfree/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'Vostfree'
     pkgNameSuffix = 'fr.vostfree'
     extClass = '.Vostfree'
-    extVersionCode = 9
+    extVersionCode = 10
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
index c4f5b033e..75caf0eae 100644
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
+++ b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/Vostfree.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.MytvExtractor
 import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.OkruExtractor
 import eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors.VudeoExtractor
@@ -121,7 +121,7 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             if (server.lowercase() == "doodstream") {
                 val playerId = it.attr("id")
                 val url = document.select("div#player-tabs div.tab-blocks div.tab-content div div#content_$playerId").text()
-                val video = DoodExtractor(client).videoFromUrl(url, "DoodStream")
+                val video = DoodExtractor(client).videoFromUrl(url, "DoodStream", false)
                 if (video != null) {
                     videoList.add(video)
                 }
diff --git a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt b/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt
deleted file mode 100644
index 86cb4bf5b..000000000
--- a/src/fr/vostfree/src/eu/kanade/tachiyomi/animeextension/fr/vostfree/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.fr.vostfree.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, quality: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-
-        return Video(url, quality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/it/animeworld/build.gradle b/src/it/animeworld/build.gradle
index eb00ae84a..f34ebb252 100644
--- a/src/it/animeworld/build.gradle
+++ b/src/it/animeworld/build.gradle
@@ -5,8 +5,12 @@ ext {
     extName = 'ANIMEWORLD.tv'
     pkgNameSuffix = 'it.animeworld'
     extClass = '.ANIMEWORLD'
-    extVersionCode = 12
+    extVersionCode = 13
     libVersion = '13'
 }
 
+dependencies {
+    implementation(project(':lib-dood-extractor'))
+}
+
 apply from: "$rootDir/common.gradle"
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
index dc83587ae..75abe9ad6 100644
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
+++ b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.it.animeworld.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.it.animeworld.extractors.StreamSBExtractor
 import eu.kanade.tachiyomi.animeextension.it.animeworld.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
diff --git a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt b/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt
deleted file mode 100644
index 996bf062f..000000000
--- a/src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.it.animeworld.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "Doodstream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}
diff --git a/src/pt/animesvision/build.gradle b/src/pt/animesvision/build.gradle
index 8d7614646..b86a805f2 100644
--- a/src/pt/animesvision/build.gradle
+++ b/src/pt/animesvision/build.gradle
@@ -6,12 +6,12 @@ ext {
     extName = 'AnimesVision'
     pkgNameSuffix = 'pt.animesvision'
     extClass = '.AnimesVision'
-    extVersionCode = 7
+    extVersionCode = 8
     libVersion = '13'
 }
 
 dependencies {
-    compileOnly 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
+    implementation(project(':lib-dood-extractor'))
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt
index 0defd4303..fcf2c7eb5 100644
--- a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt
+++ b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/AnimesVision.kt
@@ -8,7 +8,7 @@ import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.pt.animesvision.dto.AVResponseDto
 import eu.kanade.tachiyomi.animeextension.pt.animesvision.dto.PayloadData
 import eu.kanade.tachiyomi.animeextension.pt.animesvision.dto.PayloadItem
-import eu.kanade.tachiyomi.animeextension.pt.animesvision.extractors.DoodExtractor
+import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.animeextension.pt.animesvision.extractors.GlobalVisionExtractor
 import eu.kanade.tachiyomi.animeextension.pt.animesvision.extractors.StreamTapeExtractor
 import eu.kanade.tachiyomi.animeextension.pt.animesvision.extractors.VoeExtractor
diff --git a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt b/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt
deleted file mode 100644
index 0ad059355..000000000
--- a/src/pt/animesvision/src/eu/kanade/tachiyomi/animeextension/pt/animesvision/extractors/DoodExtractor.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.animesvision.extractors
-
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class DoodExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String): Video? {
-        val response = client.newCall(GET(url)).execute()
-        // Overwrite url to the redirected one
-        val url = response.request.url.toString()
-        val doodTld = url.substringAfter("https://dood.").substringBefore("/")
-        val content = response.body!!.string()
-        if (!content.contains("'/pass_md5/")) return null
-        val md5 = content.substringAfter("'/pass_md5/").substringBefore("',")
-        val token = md5.substringAfterLast("/")
-        val randomString = getRandomString()
-        val expiry = System.currentTimeMillis()
-        val videoUrlStart = client.newCall(
-            GET(
-                "https://dood.$doodTld/pass_md5/$md5",
-                Headers.headersOf("referer", url)
-            )
-        ).execute().body!!.string()
-        val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry"
-        val newQuality = "DoodStream mirror"
-
-        return Video(url, newQuality, videoUrl, headers = doodHeaders(doodTld))
-    }
-
-    private fun getRandomString(length: Int = 10): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        return (1..length)
-            .map { allowedChars.random() }
-            .joinToString("")
-    }
-
-    private fun doodHeaders(tld: String) = Headers.Builder().apply {
-        add("User-Agent", "Aniyomi")
-        add("Referer", "https://dood.$tld/")
-    }.build()
-}