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

[cleanup] Remove dead extractors #8604

Merged
merged 32 commits into from Nov 26, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d6c3b1f
[cleanup] Remove dead extractors
seproDev Nov 17, 2023
ead0db6
Missed import removal
seproDev Nov 17, 2023
846f983
Remove unused imports
seproDev Nov 17, 2023
975e47a
And again
seproDev Nov 17, 2023
7bc389a
Restore CMT
seproDev Nov 17, 2023
1644ed2
Mark CMT ad broken
seproDev Nov 17, 2023
b65d28b
Restore AdobeTv
seproDev Nov 17, 2023
7d606e6
Restore Voot
seproDev Nov 17, 2023
f64b65d
Mark Voot as broken
seproDev Nov 17, 2023
56f16ce
Remove NintendoIE
seproDev Nov 17, 2023
2995dc3
Restore wat
seproDev Nov 17, 2023
0f8af64
Remove leftover files
seproDev Nov 17, 2023
a4fb6d7
Mark MSN as broken
seproDev Nov 17, 2023
91402a5
Remove HowCast
seproDev Nov 18, 2023
a9ca245
Cleanup Oooyala mess
seproDev Nov 18, 2023
84a40e5
Remove Ooyala based URL in kinja
seproDev Nov 18, 2023
e5c8c98
Fix my mistakes
seproDev Nov 18, 2023
599c152
Update generic tests
seproDev Nov 18, 2023
71402e8
Mark Clubic as broken
seproDev Nov 18, 2023
91a9087
Remove ooyala tests from generic
seproDev Nov 18, 2023
d369afa
Restore NintendoIE
seproDev Nov 18, 2023
71fa331
Merge branch 'master' into dead
seproDev Nov 18, 2023
3a4abc0
Remove moevideo
seproDev Nov 18, 2023
ba03401
Remove movieclips
seproDev Nov 18, 2023
f8a7bd4
Remove recurbate
seproDev Nov 18, 2023
5d1d0f5
Revert some ooyala changes
seproDev Nov 18, 2023
64e39ed
Remove vzaar
seproDev Nov 18, 2023
144cff8
Remove fusion
seproDev Nov 20, 2023
f557e17
Remove hitbox
seproDev Nov 20, 2023
e66d62e
Remove watchbox
seproDev Nov 20, 2023
9a07511
Remove clipsyndicate
seproDev Nov 20, 2023
e21545c
Remove mnet
seproDev Nov 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion yt_dlp/extractor/bfi.py
Expand Up @@ -5,6 +5,7 @@


class BFIPlayerIE(InfoExtractor):
_WORKING = False
IE_NAME = 'bfi:player'
_VALID_URL = r'https?://player\.bfi\.org\.uk/[^/]+/film/watch-(?P<id>[\w-]+)-online'
_TEST = {
Expand All @@ -29,6 +30,6 @@ def _real_extract(self, url):
if not ooyala_id:
continue
entries.append(self.url_result(
'ooyala:' + ooyala_id, 'Ooyala',
'ooyala:' + ooyala_id,
ooyala_id, player_attr.get('data-label')))
bashonly marked this conversation as resolved.
Show resolved Hide resolved
return self.playlist_result(entries)
4 changes: 1 addition & 3 deletions yt_dlp/extractor/bleacherreport.py
Expand Up @@ -22,7 +22,7 @@ class BleacherReportIE(InfoExtractor):
'upload_date': '20150615',
'uploader': 'Team Stream Now ',
},
'add_ie': ['Ooyala'],
'skip': 'Video removed',
}, {
'url': 'http://bleacherreport.com/articles/2586817-aussie-golfers-get-fright-of-their-lives-after-being-chased-by-angry-kangaroo',
'md5': '6a5cd403418c7b01719248ca97fb0692',
Expand Down Expand Up @@ -70,8 +70,6 @@ def _real_extract(self, url):
video_type = video['type']
if video_type in ('cms.bleacherreport.com', 'vid.bleacherreport.com'):
info['url'] = 'http://bleacherreport.com/video_embed?id=%s' % video['id']
elif video_type == 'ooyala.com':
info['url'] = 'ooyala:%s' % video['id']
elif video_type == 'youtube.com':
info['url'] = video['id']
elif video_type == 'vine.co':
Expand Down
16 changes: 1 addition & 15 deletions yt_dlp/extractor/byutv.py
Expand Up @@ -8,9 +8,9 @@


class BYUtvIE(InfoExtractor):
_WORKING = False
_VALID_URL = r'https?://(?:www\.)?byutv\.org/(?:watch|player)/(?!event/)(?P<id>[0-9a-f-]+)(?:/(?P<display_id>[^/?#&]+))?'
_TESTS = [{
# ooyalaVOD
'url': 'http://www.byutv.org/watch/6587b9a3-89d2-42a6-a7f7-fd2f81840a7d/studio-c-season-5-episode-5',
'info_dict': {
'id': 'ZvanRocTpW-G5_yZFeltTAMv6jxOU9KH',
Expand All @@ -24,7 +24,6 @@ class BYUtvIE(InfoExtractor):
'params': {
'skip_download': True,
},
'add_ie': ['Ooyala'],
}, {
# dvr
'url': 'https://www.byutv.org/player/8f1dab9b-b243-47c8-b525-3e2d021a3451/byu-softball-pacific-vs-byu-41219---game-2',
Expand Down Expand Up @@ -63,19 +62,6 @@ def _real_extract(self, url):
'x-byutv-platformkey': 'xsaaw9c7y5',
})

ep = video.get('ooyalaVOD')
if ep:
return {
'_type': 'url_transparent',
'ie_key': 'Ooyala',
'url': 'ooyala:%s' % ep['providerId'],
'id': video_id,
'display_id': display_id,
'title': ep.get('title'),
'description': ep.get('description'),
'thumbnail': ep.get('imageThumbnail'),
}

info = {}
formats = []
subtitles = {}
Expand Down
5 changes: 3 additions & 2 deletions yt_dlp/extractor/generic.py
Expand Up @@ -384,7 +384,7 @@ class GenericIE(InfoExtractor):
'title': '2cc213299525360.mov', # that's what we get
'duration': 238.231,
},
'add_ie': ['Ooyala'],
seproDev marked this conversation as resolved.
Show resolved Hide resolved
'skip': 'Ooyala was shut down',
},
{
# ooyala video embedded with http://player.ooyala.com/iframe.js
Expand Down Expand Up @@ -412,7 +412,8 @@ class GenericIE(InfoExtractor):
},
'params': {
'skip_download': True,
}
seproDev marked this conversation as resolved.
Show resolved Hide resolved
},
'skip': 'Ooyala was shut down',
},
# embed.ly video
{
Expand Down
1 change: 0 additions & 1 deletion yt_dlp/extractor/groupon.py
Expand Up @@ -31,7 +31,6 @@ class GrouponIE(InfoExtractor):
}

_PROVIDERS = {
'ooyala': ('ooyala:%s', 'Ooyala'),
'youtube': ('%s', 'Youtube'),
}

Expand Down
4 changes: 0 additions & 4 deletions yt_dlp/extractor/kinja.py
Expand Up @@ -41,7 +41,6 @@ class KinjaEmbedIE(InfoExtractor):
kinjavideo|
mcp|
megaphone|
ooyala|
soundcloud(?:-playlist)?|
tumblr-post|
twitch-stream|
Expand Down Expand Up @@ -103,7 +102,6 @@ class KinjaEmbedIE(InfoExtractor):
'jwplayer-video': _JWPLATFORM_PROVIDER,
'jwp-video': _JWPLATFORM_PROVIDER,
'megaphone': ('player.megaphone.fm/', 'Generic'),
'ooyala': ('player.ooyala.com/player.js?embedCode=', 'Ooyala'),
'soundcloud': ('api.soundcloud.com/tracks/', 'Soundcloud'),
'soundcloud-playlist': ('api.soundcloud.com/playlists/', 'SoundcloudPlaylist'),
'tumblr-post': ('%s.tumblr.com/post/%s', 'Tumblr'),
Expand All @@ -129,8 +127,6 @@ def _real_extract(self, url):
video_id, playlist_id = video_id.split('/')
result_url = provider[0] % (video_id, playlist_id)
else:
if video_type == 'ooyala':
video_id = video_id.split('/')[0]
result_url = provider[0] + video_id
return self.url_result('http://' + result_url, provider[1])

Expand Down
3 changes: 2 additions & 1 deletion yt_dlp/extractor/nrl.py
Expand Up @@ -2,6 +2,7 @@


class NRLTVIE(InfoExtractor):
_WORKING = False
_VALID_URL = r'https?://(?:www\.)?nrl\.com/tv(/[^/]+)*/(?P<id>[^/?&#]+)'
_TEST = {
'url': 'https://www.nrl.com/tv/news/match-highlights-titans-v-knights-862805/',
Expand All @@ -23,4 +24,4 @@ def _real_extract(self, url):
r'(?s)q-data="({.+?})"', webpage, 'player data'), display_id)
ooyala_id = q_data['videoId']
return self.url_result(
'ooyala:' + ooyala_id, 'Ooyala', ooyala_id, q_data.get('title'))
'ooyala:' + ooyala_id, ooyala_id, q_data.get('title'))
seproDev marked this conversation as resolved.
Show resolved Hide resolved
33 changes: 6 additions & 27 deletions yt_dlp/extractor/sky.py
Expand Up @@ -3,39 +3,18 @@
from .common import InfoExtractor
from ..utils import (
extract_attributes,
smuggle_url,
strip_or_none,
urljoin,
)


class SkyBaseIE(InfoExtractor):
BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
_SDC_EL_REGEX = r'(?s)(<div[^>]+data-(?:component-name|fn)="sdc-(?:articl|sit)e-video"[^>]*>)'

def _process_ooyala_element(self, webpage, sdc_el, url):
def _process_video_element(self, webpage, sdc_el, url):
sdc = extract_attributes(sdc_el)
provider = sdc.get('data-provider')
if provider == 'ooyala':
video_id = sdc['data-sdc-video-id']
video_url = 'ooyala:%s' % video_id
ie_key = 'Ooyala'
ooyala_el = self._search_regex(
r'(<div[^>]+class="[^"]*\bsdc-article-video__media-ooyala\b[^"]*"[^>]+data-video-id="%s"[^>]*>)' % video_id,
webpage, 'video data', fatal=False)
if ooyala_el:
ooyala_attrs = extract_attributes(ooyala_el) or {}
if ooyala_attrs.get('data-token-required') == 'true':
token_fetch_url = (self._parse_json(ooyala_attrs.get(
'data-token-fetch-options', '{}'),
video_id, fatal=False) or {}).get('url')
if token_fetch_url:
embed_token = self._download_json(urljoin(
url, token_fetch_url), video_id, fatal=False)
if embed_token:
video_url = smuggle_url(
video_url, {'embed_token': embed_token})
elif provider == 'brightcove':
if provider == 'brightcove':
video_id = sdc['data-video-id']
account_id = sdc.get('data-account-id') or '6058004172001'
player_id = sdc.get('data-player-id') or 'RC9PQUaJ6'
Expand All @@ -52,7 +31,7 @@ def _process_ooyala_element(self, webpage, sdc_el, url):
def _real_extract(self, url):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
info = self._process_ooyala_element(webpage, self._search_regex(
info = self._process_video_element(webpage, self._search_regex(
self._SDC_EL_REGEX, webpage, 'sdc element'), url)
info.update({
'title': self._og_search_title(webpage),
Expand All @@ -73,7 +52,7 @@ class SkySportsIE(SkyBaseIE):
'title': 'Bale: It\'s our time to shine',
'description': 'md5:e88bda94ae15f7720c5cb467e777bb6d',
},
'add_ie': ['Ooyala'],
'add_ie': ['BrightcoveNew'],
}, {
'url': 'https://www.skysports.com/watch/video/sports/f1/12160544/abu-dhabi-gp-the-notebook',
'only_matching': True,
Expand Down Expand Up @@ -122,7 +101,7 @@ def _real_extract(self, url):
article_id = self._match_id(url)
webpage = self._download_webpage(url, article_id)

entries = [self._process_ooyala_element(webpage, sdc_el, url)
entries = [self._process_video_element(webpage, sdc_el, url)
for sdc_el in re.findall(self._SDC_EL_REGEX, webpage)]

return self.playlist_result(
Expand All @@ -149,7 +128,7 @@ def _real_extract(self, url):

entries = []
for sdc_el in re.findall(self._SDC_EL_REGEX, webpage):
entries.append(self._process_ooyala_element(webpage, sdc_el, url))
entries.append(self._process_video_element(webpage, sdc_el, url))

return self.playlist_result(
entries, article_id, self._og_search_title(webpage),
Expand Down
1 change: 0 additions & 1 deletion yt_dlp/extractor/telecinco.py
Expand Up @@ -77,7 +77,6 @@ class TelecincoIE(InfoExtractor):
'url': 'http://www.telecinco.es/espanasinirmaslejos/Espana-gran-destino-turistico_2_1240605043.html',
'only_matching': True,
}, {
# ooyala video
'url': 'http://www.cuatro.com/chesterinlove/a-carta/chester-chester_in_love-chester_edu_2_2331030022.html',
'only_matching': True,
}]
Expand Down
6 changes: 0 additions & 6 deletions yt_dlp/extractor/vice.py
Expand Up @@ -302,12 +302,6 @@ def _url_res(video_url, ie_key):
if vice_url:
return _url_res(vice_url, ViceIE.ie_key())

embed_code = self._search_regex(
r'embedCode=([^&\'"]+)', body,
'ooyala embed code', default=None)
if embed_code:
return _url_res('ooyala:%s' % embed_code, 'Ooyala')

youtube_url = YoutubeIE._extract_url(body)
if youtube_url:
return _url_res(youtube_url, YoutubeIE.ie_key())
Expand Down
8 changes: 1 addition & 7 deletions yt_dlp/extractor/voxmedia.py
Expand Up @@ -51,7 +51,7 @@ def _real_extract(self, url):
info['duration'] = int_or_none(asset.get('duration'))
return info

for provider_video_type in ('ooyala', 'youtube', 'brightcove'):
for provider_video_type in ('youtube', 'brightcove'):
provider_video_id = video_data.get('%s_id' % provider_video_type)
if not provider_video_id:
continue
Expand Down Expand Up @@ -177,7 +177,6 @@ def _real_extract(self, url):
def create_entry(provider_video_id, provider_video_type, title=None, description=None):
video_url = {
'youtube': '%s',
'ooyala': 'ooyala:%s',
'volume': 'http://volume.vox-cdn.com/embed/%s',
}[provider_video_type] % provider_video_id
return {
Expand Down Expand Up @@ -205,11 +204,6 @@ def create_entry(provider_video_id, provider_video_type, title=None, description
provider_video_id, provider_video_type,
video_data.get('title'), video_data.get('description')))

provider_video_id = self._search_regex(
r'data-ooyala-id="([^"]+)"', webpage, 'ooyala id', default=None)
if provider_video_id:
entries.append(create_entry(provider_video_id, 'ooyala'))

volume_uuid = self._search_regex(
r'data-volume-uuid="([^"]+)"', webpage, 'volume uuid', default=None)
if volume_uuid:
Expand Down