From dbc591b194f42d885576f3ef9e615c2c61028a08 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Sat, 29 Oct 2016 14:06:07 +0200 Subject: [PATCH 1/7] [zdf] update for the completely new video portal launched Oct 28 --- youtube_dl/extractor/zdf.py | 263 +++++++++++------------------------- 1 file changed, 77 insertions(+), 186 deletions(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 2ef177275..8f6e07372 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -6,207 +6,98 @@ import re from .common import InfoExtractor from ..utils import ( - int_or_none, - unified_strdate, OnDemandPagedList, - xpath_text, determine_ext, - qualities, - float_or_none, - ExtractorError, ) - class ZDFIE(InfoExtractor): - _VALID_URL = r'(?:zdf:|zdf:video:|https?://www\.zdf\.de/ZDFmediathek(?:#)?/(.*beitrag/(?:video/)?))(?P[0-9]+)(?:/[^/?]+)?(?:\?.*)?' + _VALID_URL = r'https?://www\.zdf\.de/.*?/(?P[^/?]*?)\.html' _TESTS = [{ - 'url': 'http://www.zdf.de/ZDFmediathek/beitrag/video/2037704/ZDFspezial---Ende-des-Machtpokers--?bc=sts;stt', + 'url': 'https://www.zdf.de/service-und-hilfe/die-neue-zdf-mediathek/zdfmediathek-trailer-100.html', 'info_dict': { - 'id': '2037704', - 'ext': 'webm', - 'title': 'ZDFspezial - Ende des Machtpokers', - 'description': 'Union und SPD haben sich auf einen Koalitionsvertrag geeinigt. Aber was bedeutet das für die Bürger? Sehen Sie hierzu das ZDFspezial "Ende des Machtpokers - Große Koalition für Deutschland".', - 'duration': 1022, - 'uploader': 'spezial', - 'uploader_id': '225948', - 'upload_date': '20131127', - }, - 'skip': 'Videos on ZDF.de are depublicised in short order', - }] - - def _parse_smil_formats(self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None): - param_groups = {} - for param_group in smil.findall(self._xpath_ns('./head/paramGroup', namespace)): - group_id = param_group.attrib.get(self._xpath_ns('id', 'http://www.w3.org/XML/1998/namespace')) - params = {} - for param in param_group: - params[param.get('name')] = param.get('value') - param_groups[group_id] = params - - formats = [] - for video in smil.findall(self._xpath_ns('.//video', namespace)): - src = video.get('src') - if not src: - continue - bitrate = float_or_none(video.get('system-bitrate') or video.get('systemBitrate'), 1000) - group_id = video.get('paramGroup') - param_group = param_groups[group_id] - for proto in param_group['protocols'].split(','): - formats.append({ - 'url': '%s://%s' % (proto, param_group['host']), - 'app': param_group['app'], - 'play_path': src, - 'ext': 'flv', - 'format_id': '%s-%d' % (proto, bitrate), - 'tbr': bitrate, - }) - self._sort_formats(formats) - return formats - - def extract_from_xml_url(self, video_id, xml_url): - doc = self._download_xml( - xml_url, video_id, - note='Downloading video info', - errnote='Failed to download video info') - - status_code = doc.find('./status/statuscode') - if status_code is not None and status_code.text != 'ok': - code = status_code.text - if code == 'notVisibleAnymore': - message = 'Video %s is not available' % video_id - else: - message = '%s returned error: %s' % (self.IE_NAME, code) - raise ExtractorError(message, expected=True) - - title = doc.find('.//information/title').text - description = xpath_text(doc, './/information/detail', 'description') - duration = int_or_none(xpath_text(doc, './/details/lengthSec', 'duration')) - uploader = xpath_text(doc, './/details/originChannelTitle', 'uploader') - uploader_id = xpath_text(doc, './/details/originChannelId', 'uploader id') - upload_date = unified_strdate(xpath_text(doc, './/details/airtime', 'upload date')) - subtitles = {} - captions_url = doc.find('.//caption/url') - if captions_url is not None: - subtitles['de'] = [{ - 'url': captions_url.text, - 'ext': 'ttml', - }] - - def xml_to_thumbnails(fnode): - thumbnails = [] - for node in fnode: - thumbnail_url = node.text - if not thumbnail_url: - continue - thumbnail = { - 'url': thumbnail_url, - } - if 'key' in node.attrib: - m = re.match('^([0-9]+)x([0-9]+)$', node.attrib['key']) - if m: - thumbnail['width'] = int(m.group(1)) - thumbnail['height'] = int(m.group(2)) - thumbnails.append(thumbnail) - return thumbnails - - thumbnails = xml_to_thumbnails(doc.findall('.//teaserimages/teaserimage')) - - format_nodes = doc.findall('.//formitaeten/formitaet') - quality = qualities(['veryhigh', 'high', 'med', 'low']) - - def get_quality(elem): - return quality(xpath_text(elem, 'quality')) - format_nodes.sort(key=get_quality) - format_ids = [] - formats = [] - for fnode in format_nodes: - video_url = fnode.find('url').text - is_available = 'http://www.metafilegenerator' not in video_url - if not is_available: - continue - format_id = fnode.attrib['basetype'] - quality = xpath_text(fnode, './quality', 'quality') - format_m = re.match(r'''(?x) - (?P[^_]+)_(?P[^_]+)_(?P[^_]+)_ - (?P[^_]+)_(?P[^_]+)_(?P[^_]+) - ''', format_id) - - ext = determine_ext(video_url, None) or format_m.group('container') - if ext not in ('smil', 'f4m', 'm3u8'): - format_id = format_id + '-' + quality - if format_id in format_ids: - continue - - if ext == 'meta': - continue - elif ext == 'smil': - formats.extend(self._extract_smil_formats( - video_url, video_id, fatal=False)) - elif ext == 'm3u8': - # the certificates are misconfigured (see - # https://github.com/rg3/youtube-dl/issues/8665) - if video_url.startswith('https://'): - continue - formats.extend(self._extract_m3u8_formats( - video_url, video_id, 'mp4', m3u8_id=format_id, fatal=False)) - elif ext == 'f4m': - formats.extend(self._extract_f4m_formats( - video_url, video_id, f4m_id=format_id, fatal=False)) - else: - proto = format_m.group('proto').lower() - - abr = int_or_none(xpath_text(fnode, './audioBitrate', 'abr'), 1000) - vbr = int_or_none(xpath_text(fnode, './videoBitrate', 'vbr'), 1000) - - width = int_or_none(xpath_text(fnode, './width', 'width')) - height = int_or_none(xpath_text(fnode, './height', 'height')) - - filesize = int_or_none(xpath_text(fnode, './filesize', 'filesize')) - - format_note = '' - if not format_note: - format_note = None - - formats.append({ - 'format_id': format_id, - 'url': video_url, - 'ext': ext, - 'acodec': format_m.group('acodec'), - 'vcodec': format_m.group('vcodec'), - 'abr': abr, - 'vbr': vbr, - 'width': width, - 'height': height, - 'filesize': filesize, - 'format_note': format_note, - 'protocol': proto, - '_available': is_available, - }) - format_ids.append(format_id) - - self._sort_formats(formats) - - return { - 'id': video_id, - 'title': title, - 'description': description, - 'duration': duration, - 'thumbnails': thumbnails, - 'uploader': uploader, - 'uploader_id': uploader_id, - 'upload_date': upload_date, - 'formats': formats, - 'subtitles': subtitles, + 'id': 'zdfmediathek-trailer-100', + 'ext': 'mp4', + 'title': 'Trailer ZDFmediathek Supermarkt', } + }] def _real_extract(self, url): video_id = self._match_id(url) - xml_url = 'http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?ak=web&id=%s' % video_id - return self.extract_from_xml_url(video_id, xml_url) + print('video_id: {}'.format(video_id)) + webpage = self._download_webpage(url, video_id) + jsb = self._search_regex(r"data-zdfplayer-jsb='([^']*)'", webpage, 'zdfplayer jsb data', flags=re.DOTALL) + jsb_json = self._parse_json(jsb, video_id) + + configuration_url = 'https://www.zdf.de' + jsb_json['config'] + configuration_json = self._download_json(configuration_url, video_id, note='Downloading player configuration') + api_token = configuration_json['apiToken'] + + player_js = self._download_webpage('https://www.zdf.de/ZDFplayer/latest-v2/skins/zdf/zdf-player.js', video_id, note='Downloading player script') + player_id = self._search_regex(r'this\.ptmd_player_id="([^"]*)"', player_js, 'player id') + + content_json = self._download_json(jsb_json['content'], video_id, headers={'Api-Auth': 'Bearer {}'.format(api_token)}, note='Downloading content description') + main_video_content = content_json['mainVideoContent']['http://zdf.de/rels/target'] + meta_data_url_template = main_video_content['http://zdf.de/rels/streams/ptmd-template'] + meta_data_url = 'https://api.zdf.de' + meta_data_url_template.replace('{playerId}', player_id) + + title = main_video_content['title'] + + meta_data = self._download_json(meta_data_url, video_id, note='Downloading meta data') + + formats = [] + for p_list_entry in meta_data['priorityList']: + for formitaet in p_list_entry['formitaeten']: + # mime = formitaet.get('mimeType') + facets = formitaet.get('facets') or [] + add = '' + if formitaet.get('isAdaptive'): + add += 'a' + facets.append('adaptive') + if 'restriction_useragent' in facets: + add += 'b' + if 'progressive' in facets: + add += 'p' + type_ = formitaet['type'] + for entry in formitaet['qualities']: + tracks = entry['audio']['tracks'] + if not tracks: + continue + if len(tracks) > 1: + self._downloader.report_warning('unexpected input: multiple tracks') + track = tracks[0] + video_url = track['uri'] + format_id = type_ + '-' + if add: + format_id += add + '-' + # named qualities are not very useful for sorting the formats: + # a 'high' m3u8 entry can be better quality than a 'veryhigh' direct mp4 download + format_id += entry['quality'] + ext = determine_ext(video_url, None) + if ext == 'meta': + continue + if ext == 'm3u8': + formats.extend(self._extract_m3u8_formats( + video_url, video_id, 'mp4', m3u8_id=format_id, fatal=False)) + elif ext == 'f4m': + formats.extend(self._extract_f4m_formats( + video_url, video_id, f4m_id=format_id, fatal=False)) + else: + formats.append({ + 'format_id': format_id, + 'url': video_url, + 'format_note': ', '.join(facets) + }) + self._sort_formats(formats) + return { + 'id': video_id, + 'title': title, + 'formats': formats + } class ZDFChannelIE(InfoExtractor): + _WORKING = False _VALID_URL = r'(?:zdf:topic:|https?://www\.zdf\.de/ZDFmediathek(?:#)?/.*kanaluebersicht/(?:[^/]+/)?)(?P[0-9]+)' _TESTS = [{ 'url': 'http://www.zdf.de/ZDFmediathek#/kanaluebersicht/1586442/sendung/Titanic', From 07607b7a22f64364209886e5dced5c9f6a70f539 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Mon, 31 Oct 2016 17:07:00 +0100 Subject: [PATCH 2/7] select better title (thanks jaimeMF for the hint) --- youtube_dl/extractor/zdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 8f6e07372..8218b4ef9 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -42,7 +42,7 @@ class ZDFIE(InfoExtractor): meta_data_url_template = main_video_content['http://zdf.de/rels/streams/ptmd-template'] meta_data_url = 'https://api.zdf.de' + meta_data_url_template.replace('{playerId}', player_id) - title = main_video_content['title'] + title = content_json['title'] meta_data = self._download_json(meta_data_url, video_id, note='Downloading meta data') From 959d452f35e19f35f03081fef9080e9ac4439a80 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Sun, 6 Nov 2016 14:58:57 +0100 Subject: [PATCH 3/7] fixes according to code review by dstftw: * remove debug output * remove unnecessary re.DOTALL * provide fallback for player_id --- youtube_dl/extractor/zdf.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 8218b4ef9..df501f79d 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -24,23 +24,35 @@ class ZDFIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - print('video_id: {}'.format(video_id)) webpage = self._download_webpage(url, video_id) - jsb = self._search_regex(r"data-zdfplayer-jsb='([^']*)'", webpage, 'zdfplayer jsb data', flags=re.DOTALL) + jsb = self._search_regex(r"data-zdfplayer-jsb='([^']*)'", webpage, 'zdfplayer jsb data') jsb_json = self._parse_json(jsb, video_id) configuration_url = 'https://www.zdf.de' + jsb_json['config'] configuration_json = self._download_json(configuration_url, video_id, note='Downloading player configuration') api_token = configuration_json['apiToken'] - player_js = self._download_webpage('https://www.zdf.de/ZDFplayer/latest-v2/skins/zdf/zdf-player.js', video_id, note='Downloading player script') - player_id = self._search_regex(r'this\.ptmd_player_id="([^"]*)"', player_js, 'player id') + player_js = self._download_webpage('https://www.zdf.de/ZDFplayer/latest-v2/skins/zdf/zdf-player.js', video_id, fatal=False, note='Downloading player script') + if player_js: + player_id = self._search_regex(r'this\.ptmd_player_id="([^"]*)"', player_js, 'player id', fatal=False) + else: + player_id = None content_json = self._download_json(jsb_json['content'], video_id, headers={'Api-Auth': 'Bearer {}'.format(api_token)}, note='Downloading content description') main_video_content = content_json['mainVideoContent']['http://zdf.de/rels/target'] - meta_data_url_template = main_video_content['http://zdf.de/rels/streams/ptmd-template'] - meta_data_url = 'https://api.zdf.de' + meta_data_url_template.replace('{playerId}', player_id) + meta_data_url = None + if not player_id: + # could not determine player_id => try alternativ generic URL + meta_data_url = main_video_content.get('http://zdf.de/rels/streams/ptmd') + if meta_data_url: + meta_data_url = 'https://api.zdf.de' + meta_data_url + else: + # no generic URL found => 2nd fallback: hardcoded player_id + player_id = 'ngplayer_2_3' + if not meta_data_url: + meta_data_url_template = main_video_content['http://zdf.de/rels/streams/ptmd-template'] + meta_data_url = 'https://api.zdf.de' + meta_data_url_template.replace('{playerId}', player_id) title = content_json['title'] From dfd4a8f8d2b7c5dccf90dfa08ca98ec3e4d19ae4 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Sun, 6 Nov 2016 16:19:50 +0100 Subject: [PATCH 4/7] fix format string for Python 2.6 --- youtube_dl/extractor/zdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index df501f79d..647d01d91 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -39,7 +39,7 @@ class ZDFIE(InfoExtractor): else: player_id = None - content_json = self._download_json(jsb_json['content'], video_id, headers={'Api-Auth': 'Bearer {}'.format(api_token)}, note='Downloading content description') + content_json = self._download_json(jsb_json['content'], video_id, headers={'Api-Auth': 'Bearer %s' % api_token}, note='Downloading content description') main_video_content = content_json['mainVideoContent']['http://zdf.de/rels/target'] meta_data_url = None if not player_id: From 56d30534089ff00c58cb8c55b6edb48ba92cbc1c Mon Sep 17 00:00:00 2001 From: Niklas Date: Tue, 8 Nov 2016 19:25:16 +0100 Subject: [PATCH 5/7] [zdf] add subtitles --- youtube_dl/extractor/zdf.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 647d01d91..76445a137 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -102,10 +102,24 @@ class ZDFIE(InfoExtractor): 'format_note': ', '.join(facets) }) self._sort_formats(formats) + + subtitles = {} + if meta_data.get('captions'): + subtitles['de'] = [] + for caption in meta_data['captions']: + if caption.get('language') == 'deu': + subformat = {'url': caption.get('uri')} + if caption.get('format') == 'webvtt': + subformat['ext'] = 'vtt' + elif caption.get('format') == 'ebu-tt-d-basic-de': + subformat['ext'] = 'ttml' + subtitles['de'].append(subformat) + return { 'id': video_id, 'title': title, - 'formats': formats + 'formats': formats, + 'subtitles': subtitles } class ZDFChannelIE(InfoExtractor): From 16a07c63a96c3392c31e09dfe212187fae860383 Mon Sep 17 00:00:00 2001 From: Niklas Date: Tue, 8 Nov 2016 20:15:36 +0100 Subject: [PATCH 6/7] [zdf] add additional metadata thumbnail, description, timestamp --- youtube_dl/extractor/zdf.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 76445a137..8054df1eb 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -8,6 +8,7 @@ from .common import InfoExtractor from ..utils import ( OnDemandPagedList, determine_ext, + parse_iso8601 ) class ZDFIE(InfoExtractor): @@ -115,11 +116,27 @@ class ZDFIE(InfoExtractor): subformat['ext'] = 'ttml' subtitles['de'].append(subformat) + teaser_images = content_json.get('teaserImageRef') + if teaser_images: + teaser_images_layouts = teaser_images.get('layouts') + if teaser_images_layouts: + thumbnail = teaser_images_layouts.get('original') + else: + thumbnail = None + else: + thumbnail = None + + description = content_json.get('teasertext') + timestamp = parse_iso8601(content_json.get('editorialDate')) + return { 'id': video_id, 'title': title, 'formats': formats, - 'subtitles': subtitles + 'subtitles': subtitles, + 'thumbnail': thumbnail, + 'description': description, + 'timestamp': timestamp } class ZDFChannelIE(InfoExtractor): From 8365f7ba06eae3ecb68e734ceac2deafeb2afd6b Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Fri, 11 Nov 2016 22:41:37 +0100 Subject: [PATCH 7/7] [zdf] added 2nd method based on simple URL as fallback (idea: flak3) keep complicated method as default as it has more formats and the simple URL method seems to be lacking subtitles in addition: changes to teaser image and subtitle extraction --- youtube_dl/extractor/zdf.py | 274 +++++++++++++++++++++++++----------- 1 file changed, 192 insertions(+), 82 deletions(-) diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py index 8054df1eb..530a61cdf 100644 --- a/youtube_dl/extractor/zdf.py +++ b/youtube_dl/extractor/zdf.py @@ -8,8 +8,10 @@ from .common import InfoExtractor from ..utils import ( OnDemandPagedList, determine_ext, - parse_iso8601 + parse_iso8601, + ExtractorError ) +from ..compat import compat_str class ZDFIE(InfoExtractor): _VALID_URL = r'https?://www\.zdf\.de/.*?/(?P[^/?]*?)\.html' @@ -25,23 +27,124 @@ class ZDFIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - webpage = self._download_webpage(url, video_id) + try: + extr_player = ZDFExtractorPlayer(self, url, video_id) + formats = extr_player._real_extract() + except (ExtractorError, KeyError) as e: + self._downloader.report_warning('%s: %s\nusing fallback method (mobile url)' % (type(e).__name__, compat_str(e))) + extr_mobile = ZDFExtractorMobile(self, url, video_id) + formats = extr_mobile._real_extract() + return formats - jsb = self._search_regex(r"data-zdfplayer-jsb='([^']*)'", webpage, 'zdfplayer jsb data') - jsb_json = self._parse_json(jsb, video_id) +class ZDFExtractor: + """Super class for the 2 extraction methods""" + def __init__(self, parent, url, video_id): + self.parent = parent + self.url = url + self.video_id = video_id + + def _real_extract(self): + formats = [] + for entry in self._fetch_entries(): + video_url = self._get_video_url(entry) + if not video_url: + continue + format_id = self._get_format_id(entry) + ext = determine_ext(video_url, None) + if ext == 'meta': + continue + if ext == 'm3u8': + formats.extend(self.parent._extract_m3u8_formats( + video_url, self.video_id, 'mp4', m3u8_id=format_id, fatal=False)) + elif ext == 'f4m': + formats.extend(self.parent._extract_f4m_formats( + video_url, self.video_id, f4m_id=format_id, fatal=False)) + else: + formats.append({ + 'format_id': format_id, + 'url': video_url, + 'format_note': self._get_format_note(entry) + }) + self.parent._sort_formats(formats) + + return { + 'id': self.video_id, + 'title': self._get_title(), + 'formats': formats, + 'subtitles': self._get_subtitles(), + 'thumbnail': self._get_thumbnail(), + 'description': self._get_description(), + 'timestamp': self._get_timestamp() + } + +class ZDFExtractorMobile(ZDFExtractor): + """Simple URL extraction method. Disadvantage: fewer formats, no subtitles""" + def __init__(self, parent, url, video_id): + ZDFExtractor.__init__(self, parent, url, video_id) + + def _fetch_entries(self): + meta_data_url = 'https://zdf-cdn.live.cellular.de/mediathekV2/document/' + self.video_id + self.meta_data = self.parent._download_json(meta_data_url, self.video_id, note='Downloading meta data') + return self.meta_data['document']['formitaeten'] + + def _get_title(self): + return self.meta_data['document']['titel'] + + def _get_video_url(self, entry): + return entry['url'] + + def _get_format_id(self, entry): + format_id = entry['type'] + if 'quality' in entry: + format_id += '-' + entry['quality'] + return format_id + + def _get_format_note(self, entry): + return None + + def _get_subtitles(self): + return None + + def _get_description(self): + return self.meta_data['document'].get('beschreibung') + + def _get_timestamp(self): + meta = self.meta_data['meta'] + if meta: + return parse_iso8601(meta.get('editorialDate')) + + def _get_thumbnail(self): + teaser_images = self.meta_data['document'].get('teaserBild') + if teaser_images: + max_res = max(teaser_images, key=int) + return teaser_images[max_res].get('url') + +class ZDFExtractorPlayer(ZDFExtractor): + """Extraction method that requires downloads of several pages. + + Follows the requests of the website.""" + def __init__(self, parent, url, video_id): + ZDFExtractor.__init__(self, parent, url, video_id) + + def _fetch_entries(self): + webpage = self.parent._download_webpage(self.url, self.video_id) + + jsb = self.parent._search_regex(r"data-zdfplayer-jsb='([^']*)'", webpage, 'zdfplayer jsb data') + jsb_json = self.parent._parse_json(jsb, self.video_id) configuration_url = 'https://www.zdf.de' + jsb_json['config'] - configuration_json = self._download_json(configuration_url, video_id, note='Downloading player configuration') + configuration_json = self.parent._download_json(configuration_url, self.video_id, note='Downloading player configuration') api_token = configuration_json['apiToken'] - player_js = self._download_webpage('https://www.zdf.de/ZDFplayer/latest-v2/skins/zdf/zdf-player.js', video_id, fatal=False, note='Downloading player script') + player_js = self.parent._download_webpage('https://www.zdf.de/ZDFplayer/latest-v2/skins/zdf/zdf-player.js', self.video_id, fatal=False, note='Downloading player script') if player_js: - player_id = self._search_regex(r'this\.ptmd_player_id="([^"]*)"', player_js, 'player id', fatal=False) + player_id = self.parent._search_regex(r'this\.ptmd_player_id="([^"]*)"', player_js, 'player id', fatal=False) else: player_id = None - content_json = self._download_json(jsb_json['content'], video_id, headers={'Api-Auth': 'Bearer %s' % api_token}, note='Downloading content description') - main_video_content = content_json['mainVideoContent']['http://zdf.de/rels/target'] + self.content_json = self.parent._download_json(jsb_json['content'], self.video_id, headers={'Api-Auth': 'Bearer %s' % api_token}, note='Downloading content description') + + main_video_content = self.content_json['mainVideoContent']['http://zdf.de/rels/target'] meta_data_url = None if not player_id: # could not determine player_id => try alternativ generic URL @@ -55,89 +158,96 @@ class ZDFIE(InfoExtractor): meta_data_url_template = main_video_content['http://zdf.de/rels/streams/ptmd-template'] meta_data_url = 'https://api.zdf.de' + meta_data_url_template.replace('{playerId}', player_id) - title = content_json['title'] - - meta_data = self._download_json(meta_data_url, video_id, note='Downloading meta data') + self.meta_data = self.parent._download_json(meta_data_url, self.video_id, note='Downloading meta data') formats = [] - for p_list_entry in meta_data['priorityList']: + for p_list_entry in self.meta_data['priorityList']: for formitaet in p_list_entry['formitaeten']: - # mime = formitaet.get('mimeType') - facets = formitaet.get('facets') or [] - add = '' - if formitaet.get('isAdaptive'): - add += 'a' - facets.append('adaptive') - if 'restriction_useragent' in facets: - add += 'b' - if 'progressive' in facets: - add += 'p' - type_ = formitaet['type'] for entry in formitaet['qualities']: - tracks = entry['audio']['tracks'] - if not tracks: - continue - if len(tracks) > 1: - self._downloader.report_warning('unexpected input: multiple tracks') - track = tracks[0] - video_url = track['uri'] - format_id = type_ + '-' - if add: - format_id += add + '-' - # named qualities are not very useful for sorting the formats: - # a 'high' m3u8 entry can be better quality than a 'veryhigh' direct mp4 download - format_id += entry['quality'] - ext = determine_ext(video_url, None) - if ext == 'meta': - continue - if ext == 'm3u8': - formats.extend(self._extract_m3u8_formats( - video_url, video_id, 'mp4', m3u8_id=format_id, fatal=False)) - elif ext == 'f4m': - formats.extend(self._extract_f4m_formats( - video_url, video_id, f4m_id=format_id, fatal=False)) - else: - formats.append({ - 'format_id': format_id, - 'url': video_url, - 'format_note': ', '.join(facets) - }) - self._sort_formats(formats) + yield (formitaet, entry) + def _get_title(self): + return self.content_json['title'] + + def _get_video_url(self, entry_tuple): + (formitaet, entry) = entry_tuple + tracks = entry['audio'].get('tracks') + if not tracks: + return + if len(tracks) > 1: + self._downloader.report_warning('unexpected input: multiple tracks') + track = tracks[0] + return track['uri'] + + def _get_format_id(self, entry_tuple): + (formitaet, entry) = entry_tuple + facets = self._get_facets(formitaet) + add = '' + if 'adaptive' in facets: + add += 'a' + if 'restriction_useragent' in facets: + add += 'b' + if 'progressive' in facets: + add += 'p' + type_ = formitaet['type'] + format_id = type_ + '-' + if add: + format_id += add + '-' + # named qualities are not very useful for sorting the formats: + # a 'high' m3u8 entry can be better quality than a 'veryhigh' direct mp4 download + format_id += entry['quality'] + return format_id + + def _get_facets(self, formitaet): + facets = formitaet.get('facets') or [] + if formitaet.get('isAdaptive'): + facets.append('adaptive') + return facets + + def _get_format_note(self, entry_tuple): + (formitaet, entry) = entry_tuple + return ', '.join(self._get_facets(formitaet)) + + def _get_subtitles(self): subtitles = {} - if meta_data.get('captions'): - subtitles['de'] = [] - for caption in meta_data['captions']: - if caption.get('language') == 'deu': - subformat = {'url': caption.get('uri')} - if caption.get('format') == 'webvtt': - subformat['ext'] = 'vtt' - elif caption.get('format') == 'ebu-tt-d-basic-de': - subformat['ext'] = 'ttml' - subtitles['de'].append(subformat) + if 'captions' in self.meta_data: + for caption in self.meta_data['captions']: + lang = caption.get('language') + if not lang: + continue + if lang == 'deu': + lang = 'de' + subformat = {'url': caption.get('uri')} + if caption.get('format') == 'webvtt': + subformat['ext'] = 'vtt' + elif caption.get('format') == 'ebu-tt-d-basic-de': + subformat['ext'] = 'ttml' + if not lang in subtitles: + subtitles[lang] = [] + subtitles[lang].append(subformat) + return subtitles - teaser_images = content_json.get('teaserImageRef') + def _get_description(self): + return self.content_json.get('teasertext') + + def _get_timestamp(self): + return parse_iso8601(self.content_json.get('editorialDate')) + + def _get_thumbnail(self): + teaser_images = self.content_json.get('teaserImageRef') if teaser_images: teaser_images_layouts = teaser_images.get('layouts') if teaser_images_layouts: - thumbnail = teaser_images_layouts.get('original') - else: - thumbnail = None - else: - thumbnail = None - - description = content_json.get('teasertext') - timestamp = parse_iso8601(content_json.get('editorialDate')) - - return { - 'id': video_id, - 'title': title, - 'formats': formats, - 'subtitles': subtitles, - 'thumbnail': thumbnail, - 'description': description, - 'timestamp': timestamp - } + if 'original' in teaser_images_layouts: + return teaser_images_layouts['original'] + teasers = {} + for key in teaser_images_layouts: + width = self.parent._search_regex(r'(\d+)x\d+', key, 'teaser width', fatal=False) + if width: + teasers[int(width)] = teaser_images_layouts[key] + if teasers: + best = max(teasers) + return teasers[best] class ZDFChannelIE(InfoExtractor): _WORKING = False