github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-21 20:46:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

[Zattoo] Fix extractors (#2288)

Browse source 
Closes: #1244
Authored by: goggle
This commit is contained in:
Alexander Seiler 2022-04-08 08:44:58 +02:00 committed by GitHub
parent ab0970b233
commit 9b8b7a7b5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 169 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
yt_dlp/extractor/extractors.py
View file

@ -2119,18 +2119,17 @@
EWETVIE,
GlattvisionTVIE,
MNetTVIE,
MyVisionTVIE,
NetPlusIE,
OsnatelTVIE,
QuantumTVIE,
QuicklineIE,
QuicklineLiveIE,
SaltTVIE,
SAKTVIE,
VTXTVIE,
WalyTVIE,
ZattooIE,
ZattooLiveIE,
ZattooMoviesIE,
ZattooRecordingsIE,
)
from .zdf import ZDFIE, ZDFChannelIE
from .zee5 import (

281
yt_dlp/extractor/zattoo.py
View file

@ -51,25 +51,30 @@ def _perform_login(self, username, password):
self._power_guide_hash = data['session']['power_guide_hash']
def _initialize_pre_login(self):
webpage = self._download_webpage(
self._host_url(), None, 'Downloading app token')
app_token = self._html_search_regex(
r'appToken\s*=\s*(["\'])(?P<token>(?:(?!\1).)+?)\1',
webpage, 'app token', group='token')
app_version = self._html_search_regex(
r'<!--\w+-(.+?)-', webpage, 'app version', default='2.8.2')
session_token = self._download_json(
f'{self._host_url()}/token.json', None, 'Downloading session token')['session_token']
# Will setup appropriate cookies
self._request_webpage(
'%s/zapi/v2/session/hello' % self._host_url(), None,
'%s/zapi/v3/session/hello' % self._host_url(), None,
'Opening session', data=urlencode_postdata({
'client_app_token': app_token,
'uuid': compat_str(uuid4()),
'lang': 'en',
'app_version': app_version,
'app_version': '1.8.2',
'format': 'json',
'client_app_token': session_token,
}))
def _extract_video_id_from_recording(self, recid):
playlist = self._download_json(
f'{self._host_url()}/zapi/v2/playlist', recid, 'Downloading playlist')
try:
return next(
str(item['program_id']) for item in playlist['recordings']
if item.get('program_id') and str(item.get('id')) == recid)
except (StopIteration, KeyError):
raise ExtractorError('Could not extract video id from recording')
def _extract_cid(self, video_id, channel_name):
channel_groups = self._download_json(
'%s/zapi/v2/cached/channels/%s' % (self._host_url(),
@ -118,7 +123,26 @@ def _extract_cid_and_video_info(self, video_id):
return cid, info_dict
def _extract_formats(self, cid, video_id, record_id=None, is_live=False):
def _extract_ondemand_info(self, ondemand_id):
"""
@returns (ondemand_token, ondemand_type, info_dict)
"""
data = self._download_json(
'%s/zapi/vod/movies/%s' % (self._host_url(), ondemand_id),
ondemand_id, 'Downloading ondemand information')
info_dict = {
'id': ondemand_id,
'title': data.get('title'),
'description': data.get('description'),
'duration': int_or_none(data.get('duration')),
'release_year': int_or_none(data.get('year')),
'episode_number': int_or_none(data.get('episode_number')),
'season_number': int_or_none(data.get('season_number')),
'categories': try_get(data, lambda x: x['categories'], list),
}
return data['terms_catalog'][0]['terms'][0]['token'], data['type'], info_dict
def _extract_formats(self, cid, video_id, record_id=None, ondemand_id=None, ondemand_termtoken=None, ondemand_type=None, is_live=False):
postdata_common = {
'https_watch_urls': True,
}
@ -128,11 +152,18 @@ def _extract_formats(self, cid, video_id, record_id=None, is_live=False):
url = '%s/zapi/watch/live/%s' % (self._host_url(), cid)
elif record_id:
url = '%s/zapi/watch/recording/%s' % (self._host_url(), record_id)
elif ondemand_id:
postdata_common.update({
'teasable_id': ondemand_id,
'term_token': ondemand_termtoken,
'teasable_type': ondemand_type
})
url = '%s/zapi/watch/vod/video' % self._host_url()
else:
url = '%s/zapi/watch/recall/%s/%s' % (self._host_url(), cid, video_id)
url = '%s/zapi/v3/watch/replay/%s/%s' % (self._host_url(), cid, video_id)
formats = []
for stream_type in ('dash', 'hls', 'hls5', 'hds'):
subtitles = {}
for stream_type in ('dash', 'hls7'):
postdata = postdata_common.copy()
postdata['stream_type'] = stream_type
@ -156,14 +187,16 @@ def _extract_formats(self, cid, video_id, record_id=None, is_live=False):
audio_channel = watch.get('audio_channel')
preference = 1 if audio_channel == 'A' else None
format_id = join_nonempty(stream_type, watch.get('maxrate'), audio_channel)
if stream_type in ('dash', 'dash_widevine', 'dash_playready'):
this_formats = self._extract_mpd_formats(
if stream_type.startswith('dash'):
this_formats, subs = self._extract_mpd_formats_and_subtitles(
watch_url, video_id, mpd_id=format_id, fatal=False)
elif stream_type in ('hls', 'hls5', 'hls5_fairplay'):
this_formats = self._extract_m3u8_formats(
self._merge_subtitles(subs, target=subtitles)
elif stream_type.startswith('hls'):
this_formats, subs = self._extract_m3u8_formats_and_subtitles(
watch_url, video_id, 'mp4',
entry_protocol='m3u8_native', m3u8_id=format_id,
fatal=False)
self._merge_subtitles(subs, target=subtitles)
elif stream_type == 'hds':
this_formats = self._extract_f4m_formats(
watch_url, video_id, f4m_id=format_id, fatal=False)
@ -176,109 +209,131 @@ def _extract_formats(self, cid, video_id, record_id=None, is_live=False):
this_format['quality'] = preference
formats.extend(this_formats)
self._sort_formats(formats)
return formats
return formats, subtitles
def _extract_video(self, channel_name, video_id, record_id=None, is_live=False):
if is_live:
cid = self._extract_cid(video_id, channel_name)
info_dict = {
def _extract_video(self, video_id, record_id=None):
cid, info_dict = self._extract_cid_and_video_info(video_id)
info_dict['formats'], info_dict['subtitles'] = self._extract_formats(cid, video_id, record_id=record_id)
return info_dict
def _extract_live(self, channel_name):
cid = self._extract_cid(channel_name, channel_name)
formats, subtitles = self._extract_formats(cid, cid, is_live=True)
return {
'id': channel_name,
'title': channel_name,
'is_live': True,
'format': formats,
'subtitles': subtitles
}
else:
def _extract_record(self, record_id):
video_id = self._extract_video_id_from_recording(record_id)
cid, info_dict = self._extract_cid_and_video_info(video_id)
formats = self._extract_formats(
cid, video_id, record_id=record_id, is_live=is_live)
info_dict['formats'] = formats
info_dict['formats'], info_dict['subtitles'] = self._extract_formats(cid, video_id, record_id=record_id)
return info_dict
def _extract_ondemand(self, ondemand_id):
ondemand_termtoken, ondemand_type, info_dict = self._extract_ondemand_info(ondemand_id)
info_dict['formats'], info_dict['subtitles'] = self._extract_formats(
None, ondemand_id, ondemand_id=ondemand_id,
ondemand_termtoken=ondemand_termtoken, ondemand_type=ondemand_type)
return info_dict
class QuicklineBaseIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'quickline'
_HOST = 'mobiltv.quickline.com'
class QuicklineIE(QuicklineBaseIE):
_VALID_URL = r'https?://(?:www\.)?%s/watch/(?P<channel>[^/]+)/(?P<id>[0-9]+)' % re.escape(QuicklineBaseIE._HOST)
_TEST = {
'url': 'https://mobiltv.quickline.com/watch/prosieben/130671867-maze-runner-die-auserwaehlten-in-der-brandwueste',
'only_matching': True,
}
def _real_extract(self, url):
channel_name, video_id = self._match_valid_url(url).groups()
return self._extract_video(channel_name, video_id)
class QuicklineLiveIE(QuicklineBaseIE):
_VALID_URL = r'https?://(?:www\.)?%s/watch/(?P<id>[^/]+)' % re.escape(QuicklineBaseIE._HOST)
_TEST = {
'url': 'https://mobiltv.quickline.com/watch/srf1',
'only_matching': True,
}
@classmethod
def suitable(cls, url):
return False if QuicklineIE.suitable(url) else super(QuicklineLiveIE, cls).suitable(url)
def _real_extract(self, url):
channel_name = video_id = self._match_id(url)
return self._extract_video(channel_name, video_id, is_live=True)
def _make_valid_url(host):
return rf'https?://(?:www\.)?{re.escape(host)}/watch/[^/]+?/(?P<id>[0-9]+)[^/]+(?:/(?P<recid>[0-9]+))?'
class ZattooBaseIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'zattoo'
_HOST = 'zattoo.com'
@staticmethod
def _create_valid_url(match, qs, base_re=None):
match_base = fr'|{base_re}/(?P<vid1>{match})' if base_re else '(?P<vid1>)'
return rf'''(?x)https?://(?:www\.)?zattoo\.com/(?:
[^?#]+\?(?:[^#]+&)?{qs}=(?P<vid2>{match})
{match_base}
)'''
def _make_valid_url(tmpl, host):
return tmpl % re.escape(host)
def _real_extract(self, url):
vid1, vid2 = self._match_valid_url(url).group('vid1', 'vid2')
return getattr(self, f'_extract_{self._TYPE}')(vid1 or vid2)
class ZattooIE(ZattooBaseIE):
_VALID_URL_TEMPLATE = r'https?://(?:www\.)?%s/watch/(?P<channel>[^/]+?)/(?P<id>[0-9]+)[^/]+(?:/(?P<recid>[0-9]+))?'
_VALID_URL = _make_valid_url(_VALID_URL_TEMPLATE, ZattooBaseIE._HOST)
# Since regular videos are only available for 7 days and recorded videos
# are only available for a specific user, we cannot have detailed tests.
_VALID_URL = ZattooBaseIE._create_valid_url(r'\d+', 'program', '(?:program|watch)/[^/]+')
_TYPE = 'video'
_TESTS = [{
'url': 'https://zattoo.com/watch/prosieben/130671867-maze-runner-die-auserwaehlten-in-der-brandwueste',
'url': 'https://zattoo.com/program/zdf/250170418',
'info_dict': {
'id': '250170418',
'ext': 'mp4',
'title': 'Markus Lanz',
'description': 'md5:e41cb1257de008ca62a73bb876ffa7fc',
'thumbnail': 're:http://images.zattic.com/cms/.+/format_480x360.jpg',
'creator': 'ZDF HD',
'release_year': 2022,
'episode': 'Folge 1655',
'categories': 'count:1',
'tags': 'count:2'
},
'params': {'skip_download': 'm3u8'}
}, {
'url': 'https://zattoo.com/program/daserste/210177916',
'only_matching': True,
}, {
'url': 'https://zattoo.com/watch/srf_zwei/132905652-eishockey-spengler-cup/102791477/1512211800000/1514433500000/92000',
'url': 'https://zattoo.com/guide/german?channel=srf1&program=169860555',
'only_matching': True,
}]
def _real_extract(self, url):
channel_name, video_id, record_id = self._match_valid_url(url).groups()
return self._extract_video(channel_name, video_id, record_id)
class ZattooLiveIE(ZattooBaseIE):
_VALID_URL = r'https?://(?:www\.)?zattoo\.com/watch/(?P<id>[^/]+)'
_TEST = {
'url': 'https://zattoo.com/watch/srf1',
_VALID_URL = ZattooBaseIE._create_valid_url(r'[^/?&#]+', 'channel', 'live')
_TYPE = 'live'
_TESTS = [{
'url': 'https://zattoo.com/channels/german?channel=srf_zwei',
'only_matching': True,
}
}, {
'url': 'https://zattoo.com/live/srf1',
'only_matching': True,
}]
@classmethod
def suitable(cls, url):
return False if ZattooIE.suitable(url) else super(ZattooLiveIE, cls).suitable(url)
def _real_extract(self, url):
channel_name = video_id = self._match_id(url)
return self._extract_video(channel_name, video_id, is_live=True)
return False if ZattooIE.suitable(url) else super().suitable(url)
class NetPlusIE(ZattooIE):
class ZattooMoviesIE(ZattooBaseIE):
_VALID_URL = ZattooBaseIE._create_valid_url(r'\w+', 'movie_id', 'vod/movies')
_TYPE = 'ondemand'
_TESTS = [{
'url': 'https://zattoo.com/vod/movies/7521',
'only_matching': True,
}, {
'url': 'https://zattoo.com/ondemand?movie_id=7521&term_token=9f00f43183269484edde',
'only_matching': True,
}]
class ZattooRecordingsIE(ZattooBaseIE):
_VALID_URL = ZattooBaseIE._create_valid_url(r'\d+', 'recording')
_TYPE = 'record'
_TESTS = [{
'url': 'https://zattoo.com/recordings?recording=193615508',
'only_matching': True,
}, {
'url': 'https://zattoo.com/tc/ptc_recordings_all_recordings?recording=193615420',
'only_matching': True,
}]
class NetPlusIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'netplus'
_HOST = 'netplus.tv'
_API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://www.netplus.tv/watch/abc/123-abc',
@ -286,10 +341,10 @@ class NetPlusIE(ZattooIE):
}]
class MNetTVIE(ZattooIE):
class MNetTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'mnettv'
_HOST = 'tvplus.m-net.de'
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://tvplus.m-net.de/watch/abc/123-abc',
@ -297,10 +352,10 @@ class MNetTVIE(ZattooIE):
}]
class WalyTVIE(ZattooIE):
class WalyTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'walytv'
_HOST = 'player.waly.tv'
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://player.waly.tv/watch/abc/123-abc',
@ -308,11 +363,11 @@ class WalyTVIE(ZattooIE):
}]
class BBVTVIE(ZattooIE):
class BBVTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'bbvtv'
_HOST = 'bbv-tv.net'
_API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://www.bbv-tv.net/watch/abc/123-abc',
@ -320,11 +375,11 @@ class BBVTVIE(ZattooIE):
}]
class VTXTVIE(ZattooIE):
class VTXTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'vtxtv'
_HOST = 'vtxtv.ch'
_API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://www.vtxtv.ch/watch/abc/123-abc',
@ -332,22 +387,10 @@ class VTXTVIE(ZattooIE):
}]
class MyVisionTVIE(ZattooIE):
_NETRC_MACHINE = 'myvisiontv'
_HOST = 'myvisiontv.ch'
_API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_TESTS = [{
'url': 'https://www.myvisiontv.ch/watch/abc/123-abc',
'only_matching': True,
}]
class GlattvisionTVIE(ZattooIE):
class GlattvisionTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'glattvisiontv'
_HOST = 'iptv.glattvision.ch'
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://iptv.glattvision.ch/watch/abc/123-abc',
@ -355,11 +398,11 @@ class GlattvisionTVIE(ZattooIE):
}]
class SAKTVIE(ZattooIE):
class SAKTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'saktv'
_HOST = 'saktv.ch'
_API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://www.saktv.ch/watch/abc/123-abc',
@ -367,10 +410,10 @@ class SAKTVIE(ZattooIE):
}]
class EWETVIE(ZattooIE):
class EWETVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'ewetv'
_HOST = 'tvonline.ewe.de'
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://tvonline.ewe.de/watch/abc/123-abc',
@ -378,11 +421,11 @@ class EWETVIE(ZattooIE):
}]
class QuantumTVIE(ZattooIE):
class QuantumTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'quantumtv'
_HOST = 'quantum-tv.com'
_API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://www.quantum-tv.com/watch/abc/123-abc',
@ -390,10 +433,10 @@ class QuantumTVIE(ZattooIE):
}]
class OsnatelTVIE(ZattooIE):
class OsnatelTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'osnateltv'
_HOST = 'tvonline.osnatel.de'
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://tvonline.osnatel.de/watch/abc/123-abc',
@ -401,11 +444,11 @@ class OsnatelTVIE(ZattooIE):
}]
class EinsUndEinsTVIE(ZattooIE):
class EinsUndEinsTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = '1und1tv'
_HOST = '1und1.tv'
_API_HOST = 'www.%s' % _HOST
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://www.1und1.tv/watch/abc/123-abc',
@ -413,10 +456,10 @@ class EinsUndEinsTVIE(ZattooIE):
}]
class SaltTVIE(ZattooIE):
class SaltTVIE(ZattooPlatformBaseIE):
_NETRC_MACHINE = 'salttv'
_HOST = 'tv.salt.ch'
_VALID_URL = _make_valid_url(ZattooIE._VALID_URL_TEMPLATE, _HOST)
_VALID_URL = _make_valid_url(_HOST)
_TESTS = [{
'url': 'https://tv.salt.ch/watch/abc/123-abc',