dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[prosiebensat1] Fix extraction (Closes #6215)

This commit is contained in:
Sergey M․ 2015-07-15 23:32:52 +06:00
parent b062d94eef
commit 2af0f87c8b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/prosiebensat1.py
View File

@ -9,8 +9,9 @@ from ..compat import (
compat_urllib_parse, compat_urllib_parse,
) )
from ..utils import ( from ..utils import (
unified_strdate, fix_xml_ampersands,
int_or_none, int_or_none,
unified_strdate,
) )
@ -208,7 +209,7 @@ class ProSiebenSat1IE(InfoExtractor):
clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id') clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id')
access_token = 'prosieben' access_token = 'prosieben'
client_name = 'kolibri-1.12.6' client_name = 'kolibri-2.0.19-splec4'
client_location = url client_location = url
videos_api_url = 'http://vas.sim-technik.de/vas/live/v2/videos?%s' % compat_urllib_parse.urlencode({ videos_api_url = 'http://vas.sim-technik.de/vas/live/v2/videos?%s' % compat_urllib_parse.urlencode({
@ -275,8 +276,9 @@ class ProSiebenSat1IE(InfoExtractor):
for source in urls_sources: for source in urls_sources:
protocol = source['protocol'] protocol = source['protocol']
source_url = source['url']
if protocol == 'rtmp' or protocol == 'rtmpe': if protocol == 'rtmp' or protocol == 'rtmpe':
mobj = re.search(r'^(?P<url>rtmpe?://[^/]+)/(?P<path>.+)$', source['url']) mobj = re.search(r'^(?P<url>rtmpe?://[^/]+)/(?P<path>.+)$', source_url)
if not mobj: if not mobj:
continue continue
path = mobj.group('path') path = mobj.group('path')
@ -293,9 +295,18 @@ class ProSiebenSat1IE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'format_id': '%s_%s' % (source['cdn'], source['bitrate']), 'format_id': '%s_%s' % (source['cdn'], source['bitrate']),
}) })
elif 'f4mgenerator' in source_url:
manifest = self._download_xml(
source_url, clip_id, 'Downloading generated f4m manifest',
transform_source=lambda s: fix_xml_ampersands(s).strip())
for media in manifest.findall('./{http://ns.adobe.com/f4m/2.0}media'):
manifest_url = media.get('href')
if manifest_url:
formats.extend(self._extract_f4m_formats(
manifest_url, clip_id, f4m_id='hds'))
else: else:
formats.append({ formats.append({
'url': source['url'], 'url': source_url,
'vbr': fix_bitrate(source['bitrate']), 'vbr': fix_bitrate(source['bitrate']),
}) })