aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-08-15 13:29:01 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-08-15 13:29:01 +0800
commitb6c4e36728e8f60ae7f4910a9b7027a2b702e8dc (patch)
tree7a88069291186bb3ceb5ee398fc77b5a5f929ed5 /youtube_dl/extractor
parent1a57b8c18c9bdaf5e231f2178499041446b57a3a (diff)
[jwplatform] Parse video_id from JWPlayer data
And remove a mysterious comma from 115c65793af4c56c8f1986d2640105fc7e760c13
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/jwplatform.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/jwplatform.py b/youtube_dl/extractor/jwplatform.py
index 2a499bb77..ce3126943 100644
--- a/youtube_dl/extractor/jwplatform.py
+++ b/youtube_dl/extractor/jwplatform.py
@@ -30,7 +30,7 @@ class JWPlatformBaseIE(InfoExtractor):
return self._parse_jwplayer_data(
jwplayer_data, video_id, *args, **kwargs)
- def _parse_jwplayer_data(self, jwplayer_data, video_id, require_title=True, m3u8_id=None, rtmp_params=None, base_url=None):
+ def _parse_jwplayer_data(self, jwplayer_data, video_id=None, require_title=True, m3u8_id=None, rtmp_params=None, base_url=None):
# JWPlayer backward compatibility: flattened playlists
# https://github.com/jwplayer/jwplayer/blob/v7.4.3/src/js/api/config.js#L81-L96
if 'playlist' not in jwplayer_data:
@@ -43,6 +43,8 @@ class JWPlatformBaseIE(InfoExtractor):
if 'sources' not in video_data:
video_data['sources'] = [video_data]
+ this_video_id = video_id or video_data['mediaid']
+
formats = []
for source in video_data['sources']:
source_url = self._proto_relative_url(source['file'])
@@ -52,7 +54,7 @@ class JWPlatformBaseIE(InfoExtractor):
ext = mimetype2ext(source_type) or determine_ext(source_url)
if source_type == 'hls' or ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
- source_url, video_id, 'mp4', 'm3u8_native', m3u8_id=m3u8_id, fatal=False))
+ source_url, this_video_id, 'mp4', 'm3u8_native', m3u8_id=m3u8_id, fatal=False))
# https://github.com/jwplayer/jwplayer/blob/master/src/js/providers/default.js#L67
elif source_type.startswith('audio') or ext in ('oga', 'aac', 'mp3', 'mpeg', 'vorbis'):
formats.append({
@@ -68,7 +70,7 @@ class JWPlatformBaseIE(InfoExtractor):
'ext': ext,
}
if source_url.startswith('rtmp'):
- a_format['ext'] = 'flv',
+ a_format['ext'] = 'flv'
# See com/longtailvideo/jwplayer/media/RTMPMediaProvider.as
# of jwplayer.flash.swf
@@ -95,7 +97,7 @@ class JWPlatformBaseIE(InfoExtractor):
})
entries.append({
- 'id': video_id,
+ 'id': this_video_id,
'title': video_data['title'] if require_title else video_data.get('title'),
'description': video_data.get('description'),
'thumbnail': self._proto_relative_url(video_data.get('image')),