Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Purge MyTV/myvi extractor #2592

Merged
merged 2 commits into from
Dec 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions lib/mytv-extractor/build.gradle.kts

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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> {
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 1 addition & 2 deletions src/fr/vostfree/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions src/tr/tranimeizle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ ext {
extName = 'TR Anime Izle'
pkgNameSuffix = 'tr.tranimeizle'
extClass = '.TRAnimeIzle'
extVersionCode = 10
extVersionCode = 11
libVersion = '13'
}

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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) }
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -442,7 +439,6 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
"Filemoon",
"MixDrop",
"Mp4upload",
"Myvi",
"Ok.RU",
"SendVid",
"Sibnet",
Expand Down
3 changes: 1 addition & 2 deletions src/tr/turkanime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -26,7 +25,7 @@ ext {
extName = 'Türk Anime TV'
pkgNameSuffix = 'tr.turkanime'
extClass = '.TurkAnime'
extVersionCode = 17
extVersionCode = 18
libVersion = '13'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ")
}
Expand Down Expand Up @@ -426,7 +422,6 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
"GDRIVE",
"MAIL",
"MP4UPLOAD",
"MYVI",
"MVIDOO",
"ODNOKLASSNIKI",
"SENDVID",
Expand Down