[jwplatform:base] Improve subtitles extraction

This commit is contained in:
Sergey M․ 2016-04-10 22:55:07 +06:00
parent d7eb052fa2
commit 7ebc36900d
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -13,10 +13,6 @@
class JWPlatformBaseIE(InfoExtractor):
def _parse_jwplayer_data(self, jwplayer_data, video_id, require_title=True):
video_data = jwplayer_data['playlist'][0]
subtitles = {}
for track in video_data['tracks']:
if track['kind'] == 'captions':
subtitles[track['label']] = [{'url': self._proto_relative_url(track['file'])}]
formats = []
for source in video_data['sources']:
@ -38,6 +34,15 @@ def _parse_jwplayer_data(self, jwplayer_data, video_id, require_title=True):
})
self._sort_formats(formats)
subtitles = {}
tracks = video_data.get('tracks')
if tracks and isinstance(tracks, list):
for track in tracks:
if track.get('file') and track.get('kind') == 'captions':
subtitles.setdefault(track.get('label') or 'en', []).append({
'url': self._proto_relative_url(track['file'])
})
return {
'id': video_id,
'title': video_data['title'] if require_title else video_data.get('title'),