laudom/haruhi-dl
2
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity

[nbc] Modernize

Browse source
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-02-24 14:00:31 +01:00
parent 3cfe791473
commit cd7ee7aa44
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
youtube_dl/extractor/nbc.py
View file

@ -1,3 +1,5 @@
from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
@ -8,12 +10,13 @@ class NBCNewsIE(InfoExtractor):
_VALID_URL = r'https?://www\.nbcnews\.com/video/.+?/(?P<id>\d+)' _VALID_URL = r'https?://www\.nbcnews\.com/video/.+?/(?P<id>\d+)'
_TEST = { _TEST = {
u'url': u'http://www.nbcnews.com/video/nbc-news/52753292', 'url': 'http://www.nbcnews.com/video/nbc-news/52753292',
u'file': u'52753292.flv', 'md5': '47abaac93c6eaf9ad37ee6c4463a5179',
u'md5': u'47abaac93c6eaf9ad37ee6c4463a5179', 'info_dict': {
u'info_dict': { 'id': '52753292',
u'title': u'Crew emerges after four-month Mars food study', 'ext': 'flv',
u'description': u'md5:24e632ffac72b35f8b67a12d1b6ddfc1', 'title': 'Crew emerges after four-month Mars food study',
'description': 'md5:24e632ffac72b35f8b67a12d1b6ddfc1',
}, },
} }
@ -23,10 +26,11 @@ class NBCNewsIE(InfoExtractor):
all_info = self._download_xml('http://www.nbcnews.com/id/%s/displaymode/1219' % video_id, video_id) all_info = self._download_xml('http://www.nbcnews.com/id/%s/displaymode/1219' % video_id, video_id)
info = all_info.find('video') info = all_info.find('video')
return {'id': video_id, return {
'title': info.find('headline').text, 'id': video_id,
'ext': 'flv', 'title': info.find('headline').text,
'url': find_xpath_attr(info, 'media', 'type', 'flashVideo').text, 'ext': 'flv',
'description': compat_str(info.find('caption').text), 'url': find_xpath_attr(info, 'media', 'type', 'flashVideo').text,
'thumbnail': find_xpath_attr(info, 'media', 'type', 'thumbnail').text, 'description': compat_str(info.find('caption').text),
} 'thumbnail': find_xpath_attr(info, 'media', 'type', 'thumbnail').text,
}