From 1fd38ddddbf9746854328ede2d222421900697d6 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Sat, 2 Dec 2023 07:28:44 -0300
Subject: [PATCH] fix: Purge MyTV/myvi extractor (#2592)

---
 lib/mytv-extractor/build.gradle.kts           | 17 -----------
 .../lib/mytvextractor/MytvExtractor.kt        | 29 -------------------
 .../asyaanimeleri/additional.gradle           |  1 -
 .../asyaanimeleri/src/AsyaAnimeleri.kt        |  3 --
 .../animestream/AnimeStreamGenerator.kt       |  2 +-
 src/fr/vostfree/build.gradle                  |  3 +-
 .../animeextension/fr/vostfree/Vostfree.kt    | 11 ++-----
 src/tr/tranimeizle/build.gradle               |  3 +-
 .../tr/tranimeizle/TRAnimeIzle.kt             |  4 ---
 src/tr/turkanime/build.gradle                 |  3 +-
 .../animeextension/tr/turkanime/TurkAnime.kt  |  5 ----
 11 files changed, 6 insertions(+), 75 deletions(-)
 delete mode 100644 lib/mytv-extractor/build.gradle.kts
 delete mode 100644 lib/mytv-extractor/src/main/java/eu/kanade/tachiyomi/lib/mytvextractor/MytvExtractor.kt

diff --git a/lib/mytv-extractor/build.gradle.kts b/lib/mytv-extractor/build.gradle.kts
deleted file mode 100644
index 4d167c6b27..0000000000
--- a/lib/mytv-extractor/build.gradle.kts
+++ /dev/null
@@ -1,17 +0,0 @@
-plugins {
-    id("com.android.library")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-    namespace = "eu.kanade.tachiyomi.lib.mytvextractor"
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-    }
-}
-
-dependencies {
-    compileOnly(libs.bundles.common)
-}
\ No newline at end of file
diff --git a/lib/mytv-extractor/src/main/java/eu/kanade/tachiyomi/lib/mytvextractor/MytvExtractor.kt b/lib/mytv-extractor/src/main/java/eu/kanade/tachiyomi/lib/mytvextractor/MytvExtractor.kt
deleted file mode 100644
index 10bd7f2434..0000000000
--- a/lib/mytv-extractor/src/main/java/eu/kanade/tachiyomi/lib/mytvextractor/MytvExtractor.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.lib.mytvextractor
-
-import okhttp3.OkHttpClient
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.util.asJsoup
-import eu.kanade.tachiyomi.network.GET
-import java.net.URLDecoder
-
-class MytvExtractor(private val client: OkHttpClient) {
-    fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
-        val doc = client.newCall(GET(url)).execute()
-            .use { it.asJsoup() }
-
-        val script = doc.selectFirst("script:containsData(createPlayer), script:containsData(CreatePlayer)")
-            ?.data()
-            ?: return emptyList()
-
-        val videoUrl = script.substringAfter("\"v=").substringBefore("\\u0026tp=video")
-            .let { URLDecoder.decode(it, "utf-8") }
-
-        return if (!videoUrl.startsWith("https:")) {
-            val newUrl = "https:$videoUrl"
-            listOf(Video(newUrl, "${prefix}Stream", newUrl))
-        } else {
-            listOf(Video(videoUrl, "${prefix}Mytv", videoUrl))
-        }
-
-    }
-}
diff --git a/multisrc/overrides/animestream/asyaanimeleri/additional.gradle b/multisrc/overrides/animestream/asyaanimeleri/additional.gradle
index 22dac6ec98..bcc8e7eae4 100644
--- a/multisrc/overrides/animestream/asyaanimeleri/additional.gradle
+++ b/multisrc/overrides/animestream/asyaanimeleri/additional.gradle
@@ -4,6 +4,5 @@ dependencies {
     implementation(project(":lib-sibnet-extractor"))
     implementation(project(":lib-gdriveplayer-extractor"))
     implementation(project(":lib-dood-extractor"))
-    implementation(project(":lib-mytv-extractor"))
     // implementation(project(":lib-dailymotion-extractor"))
 }
diff --git a/multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleri.kt b/multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleri.kt
index adb5816eec..bb0cbf07d4 100644
--- a/multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleri.kt
+++ b/multisrc/overrides/animestream/asyaanimeleri/src/AsyaAnimeleri.kt
@@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.gdriveplayerextractor.GdrivePlayerExtractor
-import eu.kanade.tachiyomi.lib.mytvextractor.MytvExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
 import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
@@ -108,7 +107,6 @@ class AsyaAnimeleri : AnimeStream(
     private val sibnetExtractor by lazy { SibnetExtractor(client) }
     private val gdrivePlayerExtractor by lazy { GdrivePlayerExtractor(client) }
     private val doodExtractor by lazy { DoodExtractor(client) }
-    private val mytvExtractor by lazy { MytvExtractor(client) }
     // private val dailyExtractor by lazy { DailymotionExtractor(client, headers) }
 
     override fun getVideoList(url: String, name: String): List<Video> {
@@ -117,7 +115,6 @@ class AsyaAnimeleri : AnimeStream(
             "ok.ru" -> okruExtractor.videosFromUrl(url)
             "sibnet" -> sibnetExtractor.videosFromUrl(url)
             // "daily" -> dailyExtractor.videosFromUrl(url)
-            "myvi", "mytv" -> mytvExtractor.videosFromUrl(url)
             "dood", "doodstream" -> doodExtractor.videoFromUrl(url)?.let(::listOf) ?: emptyList()
             "gdrive" -> {
                 val newUrl = "https://gdriveplayer.to/embed2.php?link=$url"
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt
index 09faa9ebf7..6c4d05c426 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt
@@ -18,7 +18,7 @@ class AnimeStreamGenerator : ThemeSourceGenerator {
         SingleLang("AnimeXin", "https://animexin.vip", "all", isNsfw = false, overrideVersionCode = 7),
         SingleLang("AnimeYT.es", "https://animeyt.es", "es", isNsfw = false, className = "AnimeYTES", pkgName = "animeytes"),
         SingleLang("Tiodonghua.com", "https://anime.tiodonghua.com", "es", isNsfw = false, className = "Tiodonghua", pkgName = "tiodonghua"),
-        SingleLang("AsyaAnimeleri", "https://asyaanimeleri.com", "tr", isNsfw = false, overrideVersionCode = 1),
+        SingleLang("AsyaAnimeleri", "https://asyaanimeleri.com", "tr", isNsfw = false, overrideVersionCode = 2),
         SingleLang("ChineseAnime", "https://chineseanime.top", "all", isNsfw = false, overrideVersionCode = 3),
         SingleLang("desu-online", "https://desu-online.pl", "pl", className = "DesuOnline", isNsfw = false, overrideVersionCode = 3),
         SingleLang("DonghuaStream", "https://donghuastream.co.in", "en", isNsfw = false, overrideVersionCode = 2),
diff --git a/src/fr/vostfree/build.gradle b/src/fr/vostfree/build.gradle
index 1d48581e3d..df1c50093d 100644
--- a/src/fr/vostfree/build.gradle
+++ b/src/fr/vostfree/build.gradle
@@ -5,14 +5,13 @@ ext {
     extName = 'Vostfree'
     pkgNameSuffix = 'fr.vostfree'
     extClass = '.Vostfree'
-    extVersionCode = 17
+    extVersionCode = 18
     libVersion = '13'
 }
 
 dependencies {
     implementation(project(':lib-vudeo-extractor'))
     implementation(project(':lib-dood-extractor'))
-    implementation(project(':lib-mytv-extractor'))
     implementation(project(':lib-okru-extractor'))
 }
 
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 0e258acef3..034dadac19 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
@@ -13,7 +13,6 @@ 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.mytvextractor.MytvExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.vudeoextractor.VudeoExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -123,12 +122,6 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     videoList.add(video)
                 }
             }
-            if (server.lowercase() == "mytv" || server.lowercase() == "stream") {
-                val playerId = it.attr("id")
-                val url = "https://www.myvi.tv/embed/" + document.select("div#player-tabs div.tab-blocks div.tab-content div div#content_$playerId").text()
-                val video = MytvExtractor(client).videosFromUrl(url)
-                videoList.addAll(video)
-            }
         }
 
         return videoList
@@ -271,8 +264,8 @@ class Vostfree : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val videoQualityPref = ListPreference(screen.context).apply {
             key = "preferred_quality"
             title = "Preferred quality"
-            entries = arrayOf("Vudeo", "Mytv", "Doodstream")
-            entryValues = arrayOf("Vudeo", "Mytv", "Doodstream")
+            entries = arrayOf("Vudeo", "Doodstream")
+            entryValues = arrayOf("Vudeo", "Doodstream")
             setDefaultValue("Vudeo")
             summary = "%s"
 
diff --git a/src/tr/tranimeizle/build.gradle b/src/tr/tranimeizle/build.gradle
index e6c2eee7c1..8d6df680a7 100644
--- a/src/tr/tranimeizle/build.gradle
+++ b/src/tr/tranimeizle/build.gradle
@@ -7,7 +7,7 @@ ext {
     extName = 'TR Anime Izle'
     pkgNameSuffix = 'tr.tranimeizle'
     extClass = '.TRAnimeIzle'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '13'
 }
 
@@ -15,7 +15,6 @@ dependencies {
     implementation(project(":lib-filemoon-extractor"))
     implementation(project(":lib-mixdrop-extractor"))
     implementation(project(":lib-mp4upload-extractor"))
-    implementation(project(":lib-mytv-extractor"))
     implementation(project(":lib-okru-extractor"))
     implementation(project(":lib-sendvid-extractor"))
     implementation(project(":lib-sibnet-extractor"))
diff --git a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
index c1de9a2e75..1509f84ea9 100644
--- a/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
+++ b/src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
@@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
-import eu.kanade.tachiyomi.lib.mytvextractor.MytvExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
@@ -225,7 +224,6 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
     private val filemoonExtractor by lazy { FilemoonExtractor(client) }
     private val mixDropExtractor by lazy { MixDropExtractor(client) }
     private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
-    private val mytvExtractor by lazy { MytvExtractor(client) }
     private val okruExtractor by lazy { OkruExtractor(client) }
     private val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
     private val sibnetExtractor by lazy { SibnetExtractor(client) }
@@ -255,7 +253,6 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
             "filemoon.sx" in url -> filemoonExtractor.videosFromUrl(url, headers = headers)
             "mixdrop" in url -> mixDropExtractor.videoFromUrl(url)
             "mp4upload" in url -> mp4uploadExtractor.videosFromUrl(url, headers)
-            "myvi." in url -> mytvExtractor.videosFromUrl(url)
             "ok.ru" in url || "odnoklassniki.ru" in url -> okruExtractor.videosFromUrl(url)
             "sendvid.com" in url -> sendvidExtractor.videosFromUrl(url)
             "video.sibnet" in url -> sibnetExtractor.videosFromUrl(url)
@@ -442,7 +439,6 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
             "Filemoon",
             "MixDrop",
             "Mp4upload",
-            "Myvi",
             "Ok.RU",
             "SendVid",
             "Sibnet",
diff --git a/src/tr/turkanime/build.gradle b/src/tr/turkanime/build.gradle
index a1a5751b40..baf912b403 100644
--- a/src/tr/turkanime/build.gradle
+++ b/src/tr/turkanime/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     implementation(project(':lib-filemoon-extractor'))
     implementation(project(':lib-googledrive-extractor'))
     implementation(project(':lib-mp4upload-extractor'))
-    implementation(project(":lib-mytv-extractor"))
     implementation(project(":lib-okru-extractor"))
     implementation(project(":lib-sendvid-extractor"))
     implementation(project(":lib-sibnet-extractor"))
@@ -26,7 +25,7 @@ ext {
     extName = 'Türk Anime TV'
     pkgNameSuffix = 'tr.turkanime'
     extClass = '.TurkAnime'
-    extVersionCode = 17
+    extVersionCode = 18
     libVersion = '13'
 }
 
diff --git a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
index e2cea37b54..09ae255de0 100644
--- a/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
+++ b/src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
@@ -26,7 +26,6 @@ import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.googledriveextractor.GoogleDriveExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
-import eu.kanade.tachiyomi.lib.mytvextractor.MytvExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
 import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
@@ -286,9 +285,6 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 "MP4UPLOAD" -> {
                     Mp4uploadExtractor(client).videosFromUrl(hosterLink, headers, prefix = "$subber: ")
                 }
-                "MYVI" -> {
-                    MytvExtractor(client).videosFromUrl(hosterLink, prefix = "$subber: ")
-                }
                 "MVIDOO" -> {
                     MVidooExtractor(client).videosFromUrl(hosterLink, prefix = "$subber: ")
                 }
@@ -426,7 +422,6 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             "GDRIVE",
             "MAIL",
             "MP4UPLOAD",
-            "MYVI",
             "MVIDOO",
             "ODNOKLASSNIKI",
             "SENDVID",