projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d7eb052
)
[jwplatform:base] Improve subtitles extraction
author
Sergey M․
<dstftw@gmail.com>
Sun, 10 Apr 2016 16:55:07 +0000
(22:55 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 10 Apr 2016 16:55:07 +0000
(22:55 +0600)
youtube_dl/extractor/jwplatform.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/jwplatform.py
b/youtube_dl/extractor/jwplatform.py
index 01601c59e2ece2d91f12859d1ff25fc8b56e1ca0..8a5e562dbc24fac4d18498e631e8f5e10d8fe038 100644
(file)
--- a/
youtube_dl/extractor/jwplatform.py
+++ b/
youtube_dl/extractor/jwplatform.py
@@
-13,10
+13,6
@@
from ..utils import (
class JWPlatformBaseIE(InfoExtractor):
def _parse_jwplayer_data(self, jwplayer_data, video_id, require_title=True):
video_data = jwplayer_data['playlist'][0]
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']:
formats = []
for source in video_data['sources']:
@@
-38,6
+34,15
@@
class JWPlatformBaseIE(InfoExtractor):
})
self._sort_formats(formats)
})
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'),
return {
'id': video_id,
'title': video_data['title'] if require_title else video_data.get('title'),