midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[cbsnews] Simplify subtitles extraction and fix test (Closes #8295)

Browse source
This commit is contained in:
Sergey M․ 2016-01-22 22:23:21 +06:00
parent 4118cc02c1
commit 220ee33f2b
1 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
youtube_dl/extractor/cbsnews.py
View file

@ -35,21 +35,11 @@ class CBSNewsIE(InfoExtractor):
'title': 'Fort Hood shooting: Army downplays mental illness as cause of attack', 'title': 'Fort Hood shooting: Army downplays mental illness as cause of attack',
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
'duration': 205, 'duration': 205,
}, 'subtitles': {
'params': { 'en': [{
# rtmp download 'ext': 'ttml',
'skip_download': True, }],
}, },
},
{
'url': 'http://www.cbsnews.com/videos/mountain-lions-of-l-a/',
'info_dict': {
'id': 'Mountain Lions of L.A.',
'ext': 'flv',
'title': 'Fort Hood shooting: Army downplays mental illness as cause of attack',
'thumbnail': 're:^http?://.*\.jpg$',
'subtitles': 're:^http?://.*\.xml$',
'duration': 787,
}, },
'params': { 'params': {
# rtmp download # rtmp download
@ -100,15 +90,12 @@ class CBSNewsIE(InfoExtractor):
fmt['ext'] = 'mp4' fmt['ext'] = 'mp4'
formats.append(fmt) formats.append(fmt)
subtitles = {}
if 'mpxRefId' in video_info: if 'mpxRefId' in video_info:
cap_url = 'http://www.cbsnews.com/videos/captions/%s.adb_xml' % video_info['mpxRefId'] subtitles['en'] = [{
subtitles = { 'ext': 'ttml',
'en': [{ 'url': 'http://www.cbsnews.com/videos/captions/%s.adb_xml' % video_info['mpxRefId'],
'url': cap_url, }]
'ext': 'xml'
}], }
else:
subtitles = {}
return { return {
'id': video_id, 'id': video_id,