mirror of https://github.com/yt-dlp/yt-dlp
[zdf/common] Use API in ZDF extractor.
This also comes with a lot of extra format fields Fixes #1518pull/8/head
parent
1fb2bcbbf7
commit
02dbf93f0e
@ -1,75 +1,100 @@
|
|||||||
|
import operator
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
determine_ext,
|
parse_xml_doc,
|
||||||
ExtractorError,
|
unified_strdate,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class ZDFIE(InfoExtractor):
|
class ZDFIE(InfoExtractor):
|
||||||
_VALID_URL = r'^http://www\.zdf\.de\/ZDFmediathek(?P<hash>#)?\/(.*beitrag\/video\/)(?P<video_id>[^/\?]+)(?:\?.*)?'
|
_VALID_URL = r'^http://www\.zdf\.de\/ZDFmediathek(?P<hash>#)?\/(.*beitrag\/video\/)(?P<video_id>[^/\?]+)(?:\?.*)?'
|
||||||
_MEDIA_STREAM = r'<a href="(?P<video_url>.+(?P<media_type>.streaming).+/zdf/(?P<quality>[^\/]+)/[^"]*)".+class="play".+>'
|
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
if mobj is None:
|
|
||||||
raise ExtractorError(u'Invalid URL: %s' % url)
|
|
||||||
video_id = mobj.group('video_id')
|
video_id = mobj.group('video_id')
|
||||||
|
|
||||||
if mobj.group('hash'):
|
xml_url = u'http://www.zdf.de/ZDFmediathek/xmlservice/web/beitragsDetails?ak=web&id=%s' % video_id
|
||||||
url = url.replace(u'#', u'', 1)
|
info_xml = self._download_webpage(
|
||||||
|
xml_url, video_id, note=u'Downloading video info')
|
||||||
|
doc = parse_xml_doc(info_xml)
|
||||||
|
|
||||||
html = self._download_webpage(url, video_id)
|
title = doc.find('.//information/title').text
|
||||||
streams = [m.groupdict() for m in re.finditer(self._MEDIA_STREAM, html)]
|
description = doc.find('.//information/detail').text
|
||||||
if streams is None:
|
uploader_node = doc.find('.//details/originChannelTitle')
|
||||||
raise ExtractorError(u'No media url found.')
|
uploader = None if uploader_node is None else uploader_node.text
|
||||||
|
duration_str = doc.find('.//details/length').text
|
||||||
|
duration_m = re.match(r'''(?x)^
|
||||||
|
(?P<hours>[0-9]{2})
|
||||||
|
:(?P<minutes>[0-9]{2})
|
||||||
|
:(?P<seconds>[0-9]{2})
|
||||||
|
(?:\.(?P<ms>[0-9]+)?)
|
||||||
|
''', duration_str)
|
||||||
|
duration = (
|
||||||
|
(
|
||||||
|
(int(duration_m.group('hours')) * 60 * 60) +
|
||||||
|
(int(duration_m.group('minutes')) * 60) +
|
||||||
|
int(duration_m.group('seconds'))
|
||||||
|
)
|
||||||
|
if duration_m
|
||||||
|
else None
|
||||||
|
)
|
||||||
|
upload_date = unified_strdate(doc.find('.//details/airtime').text)
|
||||||
|
|
||||||
|
def xml_to_format(fnode):
|
||||||
|
video_url = fnode.find('url').text
|
||||||
|
is_available = u'http://www.metafilegenerator' not in video_url
|
||||||
|
|
||||||
# s['media_type'] == 'wstreaming' -> use 'Windows Media Player' and mms url
|
format_id = fnode.attrib['basetype']
|
||||||
# s['media_type'] == 'hstreaming' -> use 'Quicktime' and rtsp url
|
format_m = re.match(r'''(?x)
|
||||||
# choose first/default media type and highest quality for now
|
(?P<vcodec>[^_]+)_(?P<acodec>[^_]+)_(?P<container>[^_]+)_
|
||||||
def stream_pref(s):
|
(?P<proto>[^_]+)_(?P<index>[^_]+)_(?P<indexproto>[^_]+)
|
||||||
TYPE_ORDER = ['ostreaming', 'hstreaming', 'wstreaming']
|
''', format_id)
|
||||||
|
|
||||||
|
PROTO_ORDER = ['http', 'rtmp', 'rtsp']
|
||||||
try:
|
try:
|
||||||
type_pref = TYPE_ORDER.index(s['media_type'])
|
proto_pref = -PROTO_ORDER.index(format_m.group('proto'))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
type_pref = 999
|
proto_pref = 999
|
||||||
|
|
||||||
QUALITY_ORDER = ['veryhigh', '300']
|
quality = fnode.find('./quality').text
|
||||||
|
QUALITY_ORDER = ['veryhigh', '300', 'high', 'med', 'low']
|
||||||
try:
|
try:
|
||||||
quality_pref = QUALITY_ORDER.index(s['quality'])
|
quality_pref = -QUALITY_ORDER.index(quality)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
quality_pref = 999
|
quality_pref = 999
|
||||||
|
|
||||||
return (type_pref, quality_pref)
|
abr = int(fnode.find('./audioBitrate').text) // 1000
|
||||||
|
vbr = int(fnode.find('./videoBitrate').text) // 1000
|
||||||
sorted_streams = sorted(streams, key=stream_pref)
|
pref = (is_available, proto_pref, quality_pref, vbr, abr)
|
||||||
if not sorted_streams:
|
|
||||||
raise ExtractorError(u'No stream found.')
|
|
||||||
stream = sorted_streams[0]
|
|
||||||
|
|
||||||
media_link = self._download_webpage(
|
|
||||||
stream['video_url'],
|
|
||||||
video_id,
|
|
||||||
u'Get stream URL')
|
|
||||||
|
|
||||||
#MMS_STREAM = r'href="(?P<video_url>mms://[^"]*)"'
|
return {
|
||||||
RTSP_STREAM = r'(?P<video_url>rtsp://[^"]*.mp4)'
|
'format_id': format_id,
|
||||||
|
'url': video_url,
|
||||||
mobj = re.search(self._MEDIA_STREAM, media_link)
|
'ext': format_m.group('container'),
|
||||||
if mobj is None:
|
'acodec': format_m.group('acodec'),
|
||||||
mobj = re.search(RTSP_STREAM, media_link)
|
'vcodec': format_m.group('vcodec'),
|
||||||
if mobj is None:
|
'abr': abr,
|
||||||
raise ExtractorError(u'Cannot extract mms:// or rtsp:// URL')
|
'vbr': vbr,
|
||||||
video_url = mobj.group('video_url')
|
'width': int(fnode.find('./width').text),
|
||||||
|
'height': int(fnode.find('./height').text),
|
||||||
|
'quality_name': quality,
|
||||||
|
'filesize': int(fnode.find('./filesize').text),
|
||||||
|
'format_note': None if is_available else u'(unavailable)',
|
||||||
|
'_pref': pref,
|
||||||
|
}
|
||||||
|
|
||||||
title = self._html_search_regex(
|
format_nodes = doc.findall('.//formitaeten/formitaet')
|
||||||
r'<h1(?: class="beitragHeadline")?>(.*?)</h1>',
|
formats = sorted(map(xml_to_format, format_nodes),
|
||||||
html, u'title')
|
key=operator.itemgetter('_pref'))
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
|
||||||
'title': title,
|
'title': title,
|
||||||
'ext': determine_ext(video_url)
|
'formats': formats,
|
||||||
|
'description': description,
|
||||||
|
'uploader': uploader,
|
||||||
|
'duration': duration,
|
||||||
|
'upload_date': upload_date,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue