projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d535e0
)
[prosiebensat1] Fix rtmp extraction (Closes #5962)
author
Sergey M․
<dstftw@gmail.com>
Fri, 12 Jun 2015 15:13:14 +0000
(21:13 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 12 Jun 2015 15:13:14 +0000
(21:13 +0600)
youtube_dl/extractor/prosiebensat1.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/prosiebensat1.py
b/youtube_dl/extractor/prosiebensat1.py
index 255d4abc131519ec470ccdc2b1a64b7d38d9f44b..6b13eb60565f6755bc4119ad5368e0a290f746eb 100644
(file)
--- a/
youtube_dl/extractor/prosiebensat1.py
+++ b/
youtube_dl/extractor/prosiebensat1.py
@@
-206,8
+206,8
@@
class ProSiebenSat1IE(InfoExtractor):
def _extract_clip(self, url, webpage):
clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id')
def _extract_clip(self, url, webpage):
clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id')
- access_token = '
testclient
'
- client_name = 'kolibri-1.
2.5
'
+ access_token = '
prosieben
'
+ client_name = 'kolibri-1.
12.6
'
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,13
+275,17
@@
class ProSiebenSat1IE(InfoExtractor):
for source in urls_sources:
protocol = source['protocol']
if protocol == 'rtmp' or protocol == 'rtmpe':
for source in urls_sources:
protocol = source['protocol']
if protocol == 'rtmp' or protocol == 'rtmpe':
- mobj = re.search(r'^(?P<url>rtmpe?://[^/]+
/(?P<app>[^/]+))/(?P<play
path>.+)$', source['url'])
+ mobj = re.search(r'^(?P<url>rtmpe?://[^/]+
)/(?P<
path>.+)$', source['url'])
if not mobj:
continue
if not mobj:
continue
+ path = mobj.group('path')
+ mp4colon_index = path.rfind('mp4:')
+ app = path[:mp4colon_index]
+ play_path = path[mp4colon_index:]
formats.append({
formats.append({
- 'url':
mobj.group('url'
),
- 'app':
mobj.group('app')
,
- 'play_path':
mobj.group('playpath')
,
+ 'url':
'%s/%s' % (mobj.group('url'), app
),
+ 'app':
app
,
+ 'play_path':
play_path
,
'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',
'page_url': 'http://www.prosieben.de',
'vbr': fix_bitrate(source['bitrate']),
'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',
'page_url': 'http://www.prosieben.de',
'vbr': fix_bitrate(source['bitrate']),