mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-22 10:21:24 +02:00
Compare commits
No commits in common. "9736c01453efd76785cd90448241fc4a50c4500f" and "8ac88e2c0677de274395eb5ea0ddc45439229d06" have entirely different histories.
9736c01453
...
8ac88e2c06
|
@ -58,13 +58,6 @@ class Tele5IE(DPlayIE): # XXX: Do not subclass from concrete IE
|
||||||
_VALID_URL = r'https?://(?:www\.)?tele5\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)'
|
_VALID_URL = r'https?://(?:www\.)?tele5\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)'
|
||||||
_GEO_COUNTRIES = ['DE']
|
_GEO_COUNTRIES = ['DE']
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://tele5.de/mediathek/schlefaz',
|
|
||||||
'info_dict': {
|
|
||||||
'id': '61b09a6bb0ed8d9799911e98',
|
|
||||||
'title': 'SchleFaZ',
|
|
||||||
},
|
|
||||||
'playlist_mincount': 4,
|
|
||||||
}, {
|
|
||||||
'url': 'https://tele5.de/mediathek/sorority-babes-in-the-slimeball-bowl-o-rama',
|
'url': 'https://tele5.de/mediathek/sorority-babes-in-the-slimeball-bowl-o-rama',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '5582852',
|
'id': '5582852',
|
||||||
|
@ -220,33 +213,19 @@ class Tele5IE(DPlayIE): # XXX: Do not subclass from concrete IE
|
||||||
player_info = site_info['player']
|
player_info = site_info['player']
|
||||||
sonic_realm = player_info['sonicRealm']
|
sonic_realm = player_info['sonicRealm']
|
||||||
sonic_endpoint = compat_urlparse.urlparse(player_info['sonicEndpoint']).hostname
|
sonic_endpoint = compat_urlparse.urlparse(player_info['sonicEndpoint']).hostname
|
||||||
|
video_id = cached_video_specific['data']['blocks'][1]['videoId']
|
||||||
video_ids = [block['videoId'] for block in cached_video_specific['data']['blocks'] if
|
except (KeyError, TypeError):
|
||||||
block['type'] == 'sonicVideoBlock']
|
|
||||||
assert len(video_ids) > 0
|
|
||||||
except (KeyError, TypeError, AssertionError):
|
|
||||||
raise ExtractorError('Could not extract Meta Data from loma-cms')
|
raise ExtractorError('Could not extract Meta Data from loma-cms')
|
||||||
|
|
||||||
entries = []
|
try:
|
||||||
for video_id in video_ids:
|
return self._get_disco_api_info(url=url,
|
||||||
try:
|
display_id=video_id,
|
||||||
video_info = self._get_disco_api_info(url=url,
|
disco_host=sonic_endpoint,
|
||||||
display_id=video_id,
|
realm=sonic_realm,
|
||||||
disco_host=sonic_endpoint,
|
country=country,
|
||||||
realm=sonic_realm,
|
api_version=3,
|
||||||
country=country,
|
)
|
||||||
api_version=3,
|
except ExtractorError as e:
|
||||||
)
|
if getattr(e, 'message', '') == 'Missing deviceId in context':
|
||||||
entries.append(video_info)
|
self.report_drm(video_id)
|
||||||
except ExtractorError as e:
|
raise
|
||||||
if getattr(e, 'message', '') == 'Missing deviceId in context':
|
|
||||||
self.report_drm(video_id)
|
|
||||||
raise
|
|
||||||
|
|
||||||
if len(video_ids) == 1:
|
|
||||||
return entries[0]
|
|
||||||
else:
|
|
||||||
return {'_type': 'playlist',
|
|
||||||
'id': cached_video_specific['data']['uid'],
|
|
||||||
'title': cached_video_specific['data']['title'],
|
|
||||||
'entries': entries}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user