From 6a62b77765e951bc57c3f55892023ffce0f5cf80 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 11:19:18 +0000
Subject: [PATCH] refactor: Make extensions use MixDrop shared lib (#1908)

---
 src/de/hdfilme/build.gradle                   |  2 +-
 .../animeextension/de/hdfilme/HDFilme.kt      |  2 +-
 .../de/hdfilme/extractors/MixDropExtractor.kt | 29 ------------------
 src/en/animedao/build.gradle                  |  2 +-
 .../animeextension/en/animedao/AnimeDao.kt    |  2 +-
 .../animedao/extractors/MixDropExtractor.kt   | 29 ------------------
 src/en/vidembed/build.gradle                  |  2 +-
 .../animeextension/en/vidembed/Membed.kt      |  2 +-
 .../vidembed/extractors/MixDropExtractor.kt   | 30 -------------------
 src/es/doramasflix/build.gradle               |  4 +--
 .../es/doramasflix/Doramasflix.kt             |  2 +-
 .../doramasflix/extractor/MixDropExtractor.kt | 29 ------------------
 src/pt/megaflix/build.gradle                  |  1 +
 .../animeextension/pt/megaflix/Megaflix.kt    |  4 +--
 .../pt/megaflix/extractor/MixDropExtractor.kt | 28 -----------------
 15 files changed, 12 insertions(+), 156 deletions(-)
 delete mode 100644 src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/extractors/MixDropExtractor.kt
 delete mode 100644 src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/extractors/MixDropExtractor.kt
 delete mode 100644 src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/MixDropExtractor.kt
 delete mode 100644 src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/MixDropExtractor.kt
 delete mode 100644 src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractor/MixDropExtractor.kt

diff --git a/src/de/hdfilme/build.gradle b/src/de/hdfilme/build.gradle
index 0604563b1..983335099 100644
--- a/src/de/hdfilme/build.gradle
+++ b/src/de/hdfilme/build.gradle
@@ -11,8 +11,8 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-mixdrop-extractor'))
     implementation(project(':lib-dood-extractor'))
-    implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
 
 
diff --git a/src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/HDFilme.kt b/src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/HDFilme.kt
index b1b7a93c4..9ea9816f9 100644
--- a/src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/HDFilme.kt
+++ b/src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/HDFilme.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.de.hdfilme.extractors.MixDropExtractor
 import eu.kanade.tachiyomi.animeextension.de.hdfilme.extractors.VudeoExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.OkHttpClient
diff --git a/src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/extractors/MixDropExtractor.kt b/src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/extractors/MixDropExtractor.kt
deleted file mode 100644
index 87fd2af1b..000000000
--- a/src/de/hdfilme/src/eu/kanade/tachiyomi/animeextension/de/hdfilme/extractors/MixDropExtractor.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.de.hdfilme.extractors
-
-import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class MixDropExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, lang: String = ""): List<Video> {
-        val doc = client.newCall(GET(url)).execute().asJsoup()
-        val unpacked = doc.selectFirst("script:containsData(eval):containsData(MDCore)")
-            ?.data()
-            ?.let { JsUnpacker.unpackAndCombine(it) }
-            ?: return emptyList<Video>()
-        val videoUrl = "https:" + unpacked.substringAfter("Core.wurl=\"")
-            .substringBefore("\"")
-        val quality = ("MixDrop").let {
-            if (lang.isNotBlank()) {
-                "$it($lang)"
-            } else {
-                it
-            }
-        }
-        val referer = Headers.headersOf("Referer", "https://mixdrop.co/")
-        return listOf(Video(url, quality, videoUrl, headers = referer))
-    }
-}
diff --git a/src/en/animedao/build.gradle b/src/en/animedao/build.gradle
index dbe223aba..ddef25797 100644
--- a/src/en/animedao/build.gradle
+++ b/src/en/animedao/build.gradle
@@ -11,11 +11,11 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-mixdrop-extractor'))
     implementation(project(':lib-mp4upload-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-streamsb-extractor'))
     implementation(project(':lib-dood-extractor'))
-    implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
 
 
diff --git a/src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/AnimeDao.kt b/src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/AnimeDao.kt
index e8111ae23..27d629393 100644
--- a/src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/AnimeDao.kt
+++ b/src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/AnimeDao.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import androidx.preference.SwitchPreferenceCompat
-import eu.kanade.tachiyomi.animeextension.en.animedao.extractors.MixDropExtractor
 import eu.kanade.tachiyomi.animeextension.en.animedao.extractors.VidstreamingExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -15,6 +14,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
diff --git a/src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/extractors/MixDropExtractor.kt b/src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/extractors/MixDropExtractor.kt
deleted file mode 100644
index 67ba854ca..000000000
--- a/src/en/animedao/src/eu/kanade/tachiyomi/animeextension/en/animedao/extractors/MixDropExtractor.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.animedao.extractors
-
-import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class MixDropExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, lang: String = "", prefix: String = ""): List<Video> {
-        val doc = client.newCall(GET(url)).execute().asJsoup()
-        val unpacked = doc.selectFirst("script:containsData(eval):containsData(MDCore)")
-            ?.data()
-            ?.let { JsUnpacker.unpackAndCombine(it) }
-            ?: return emptyList()
-        val videoUrl = "https:" + unpacked.substringAfter("Core.wurl=\"")
-            .substringBefore("\"")
-        val quality = ("MixDrop").let {
-            if (lang.isNotBlank()) {
-                "$it($lang)"
-            } else {
-                it
-            }
-        }
-        val referer = Headers.headersOf("Referer", "https://mixdrop.co/")
-        return listOf(Video(url, prefix + quality, videoUrl, headers = referer))
-    }
-}
diff --git a/src/en/vidembed/build.gradle b/src/en/vidembed/build.gradle
index a093213e9..57f6f54c0 100644
--- a/src/en/vidembed/build.gradle
+++ b/src/en/vidembed/build.gradle
@@ -11,9 +11,9 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-mixdrop-extractor'))
     implementation(project(':lib-streamsb-extractor'))
     implementation(project(':lib-dood-extractor'))
-    implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
 
 
diff --git a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Membed.kt b/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Membed.kt
index d5a8b3b59..fb86ca6cf 100644
--- a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Membed.kt
+++ b/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/Membed.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import android.net.Uri
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.en.vidembed.extractors.MixDropExtractor
 import eu.kanade.tachiyomi.animeextension.en.vidembed.extractors.XstreamcdnExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
diff --git a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/MixDropExtractor.kt b/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/MixDropExtractor.kt
deleted file mode 100644
index e73767cb6..000000000
--- a/src/en/vidembed/src/eu/kanade/tachiyomi/animeextension/en/vidembed/extractors/MixDropExtractor.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.en.vidembed.extractors
-
-import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-// From Vizer Extension
-class MixDropExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, lang: String = ""): List<Video> {
-        val doc = client.newCall(GET(url)).execute().asJsoup()
-        val unpacked = doc.selectFirst("script:containsData(eval):containsData(MDCore)")
-            ?.data()
-            ?.let { JsUnpacker.unpackAndCombine(it) }
-            ?: return emptyList<Video>()
-        val videoUrl = "https:" + unpacked.substringAfter("Core.wurl=\"")
-            .substringBefore("\"")
-        val quality = ("MixDrop").let {
-            if (lang.isNotBlank()) {
-                "$it($lang)"
-            } else {
-                it
-            }
-        }
-        val referer = Headers.headersOf("Referer", "https://mixdrop.co/")
-        return listOf(Video(url, quality, videoUrl, headers = referer))
-    }
-}
diff --git a/src/es/doramasflix/build.gradle b/src/es/doramasflix/build.gradle
index bf9ca63ed..03bb7140e 100644
--- a/src/es/doramasflix/build.gradle
+++ b/src/es/doramasflix/build.gradle
@@ -10,12 +10,12 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-mixdrop-extractor'))
     implementation(project(':lib-streamtape-extractor'))
     implementation(project(':lib-okru-extractor'))
     implementation(project(':lib-streamsb-extractor'))
     implementation(project(':lib-dood-extractor'))
-    implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
-    implementation project(path: ':lib-voe-extractor')
+    implementation(project(':lib-voe-extractor'))
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
index 1136b93a5..691f32053 100644
--- a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
+++ b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.animeextension.es.doramasflix.extractor.MixDropExtractor
 import eu.kanade.tachiyomi.animeextension.es.doramasflix.extractor.UqloadExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -13,6 +12,7 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
diff --git a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/MixDropExtractor.kt b/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/MixDropExtractor.kt
deleted file mode 100644
index cf9dfeb3c..000000000
--- a/src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/extractor/MixDropExtractor.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.es.doramasflix.extractor
-
-import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.Headers
-import okhttp3.OkHttpClient
-
-class MixDropExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, lang: String = ""): List<Video> {
-        val doc = client.newCall(GET(url)).execute().asJsoup()
-        val unpacked = doc.selectFirst("script:containsData(eval):containsData(MDCore)")
-            ?.data()
-            ?.let { JsUnpacker.unpackAndCombine(it) }
-            ?: return emptyList<Video>()
-        val videoUrl = "https:" + unpacked.substringAfter("Core.wurl=\"")
-            .substringBefore("\"")
-        val quality = ("MixDrop").let {
-            if (lang.isNotBlank()) {
-                "$it($lang)"
-            } else {
-                it
-            }
-        }
-        val referer = Headers.headersOf("Referer", "https://mixdrop.co/")
-        return listOf(Video(url, quality, videoUrl, headers = referer))
-    }
-}
diff --git a/src/pt/megaflix/build.gradle b/src/pt/megaflix/build.gradle
index 6aba61886..13fa709dd 100644
--- a/src/pt/megaflix/build.gradle
+++ b/src/pt/megaflix/build.gradle
@@ -12,6 +12,7 @@ ext {
 }
 
 dependencies {
+    implementation(project(':lib-mixdrop-extractor'))
     implementation(project(":lib-streamsb-extractor"))
     implementation(project(":lib-streamtape-extractor"))
     // for mixdrop and megaflix
diff --git a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
index 50c46bb24..3fdb64b24 100644
--- a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
+++ b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/Megaflix.kt
@@ -6,7 +6,6 @@ import android.util.Base64
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.pt.megaflix.extractors.MegaflixExtractor
-import eu.kanade.tachiyomi.animeextension.pt.megaflix.extractors.MixDropExtractor
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -14,6 +13,7 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamsbextractor.StreamSBExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -135,7 +135,7 @@ class Megaflix : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private fun getVideoList(url: String, language: String): List<Video>? {
         return when {
             "mixdrop.co" in url ->
-                MixDropExtractor(client).videoFromUrl(url, language)?.let(::listOf)
+                MixDropExtractor(client).videoFromUrl(url, language)
             "streamtape.com" in url ->
                 StreamTapeExtractor(client).videoFromUrl(url, "StreamTape - $language")?.let(::listOf)
             "watchsb.com" in url ->
diff --git a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractor/MixDropExtractor.kt b/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractor/MixDropExtractor.kt
deleted file mode 100644
index 80ed9d0e0..000000000
--- a/src/pt/megaflix/src/eu/kanade/tachiyomi/animeextension/pt/megaflix/extractor/MixDropExtractor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.megaflix.extractors
-
-import dev.datlag.jsunpacker.JsUnpacker
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.OkHttpClient
-
-class MixDropExtractor(private val client: OkHttpClient) {
-    fun videoFromUrl(url: String, lang: String = ""): Video? {
-        val doc = client.newCall(GET(url)).execute().asJsoup()
-        val unpacked = doc.selectFirst("script:containsData(eval):containsData(MDCore)")
-            ?.data()
-            ?.let(JsUnpacker::unpackAndCombine)
-            ?: return null
-
-        val videoUrl = "https:" + unpacked.substringAfter("Core.wurl=\"")
-            .substringBefore("\"")
-
-        val quality = ("MixDrop").let {
-            when {
-                lang.isNotBlank() -> "$it($lang)"
-                else -> it
-            }
-        }
-        return Video(videoUrl, quality, videoUrl)
-    }
-}