projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b062d94
)
[prosiebensat1] Fix extraction (Closes #6215)
author
Sergey M․
<dstftw@gmail.com>
Wed, 15 Jul 2015 17:32:52 +0000
(23:32 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 15 Jul 2015 17:32:52 +0000
(23:32 +0600)
youtube_dl/extractor/prosiebensat1.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/prosiebensat1.py
b/youtube_dl/extractor/prosiebensat1.py
index 536a42dc88a4e17bbd039289508521d1ea13e282..22efa903fad195a71fe800e25c15a8262eb99d08 100644
(file)
--- a/
youtube_dl/extractor/prosiebensat1.py
+++ b/
youtube_dl/extractor/prosiebensat1.py
@@
-9,8
+9,9
@@
from ..compat import (
compat_urllib_parse,
)
from ..utils import (
compat_urllib_parse,
)
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')
access_token = 'prosieben'
clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id')
access_token = 'prosieben'
- client_name = 'kolibri-
1.12.6
'
+ client_name = 'kolibri-
2.0.19-splec4
'
client_location = url
videos_api_url = 'http://vas.sim-technik.de/vas/live/v2/videos?%s' % compat_urllib_parse.urlencode({
client_location = url
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:
protocol = source['protocol']
for source in urls_sources:
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:
continue
path = mobj.group('path')
if not mobj:
continue
path = mobj.group('path')
@@
-293,9
+295,18
@@
class ProSiebenSat1IE(InfoExtractor):
'ext': 'mp4',
'format_id': '%s_%s' % (source['cdn'], source['bitrate']),
})
'ext': 'mp4',
'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:
formats.append({
else:
formats.append({
- 'url': source
['url']
,
+ 'url': source
_url
,
'vbr': fix_bitrate(source['bitrate']),
})
'vbr': fix_bitrate(source['bitrate']),
})