[infoq] Simplify (#2777)

This commit is contained in:
Philipp Hagemeister 2014-04-21 02:55:35 +02:00
parent 117a7d1944
commit c0a7c60815

View file

@ -13,14 +13,14 @@ class InfoQIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?infoq\.com/[^/]+/(?P<id>[^/]+)$' _VALID_URL = r'https?://(?:www\.)?infoq\.com/[^/]+/(?P<id>[^/]+)$'
_TEST = { _TEST = {
u'name': u'InfoQ', 'name': 'InfoQ',
u'url': u'http://www.infoq.com/presentations/A-Few-of-My-Favorite-Python-Things', 'url': 'http://www.infoq.com/presentations/A-Few-of-My-Favorite-Python-Things',
u'md5': u'fcaa3d995e04080dcb9465d86b5eef62', 'md5': 'fcaa3d995e04080dcb9465d86b5eef62',
u'info_dict': { 'info_dict': {
u'id': u'12-jan-pythonthings', 'id': '12-jan-pythonthings',
u'ext': u'mp4', 'ext': 'mp4',
u'description': u'Mike Pirnat presents some tips and tricks, standard libraries and third party packages that make programming in Python a richer experience.', 'description': 'Mike Pirnat presents some tips and tricks, standard libraries and third party packages that make programming in Python a richer experience.',
u'title': u'A Few of My Favorite [Python] Things', 'title': 'A Few of My Favorite [Python] Things',
}, },
} }
@ -30,8 +30,6 @@ class InfoQIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
self.report_extraction(video_id)
video_title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title') video_title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title')
video_description = self._html_search_meta('description', webpage, 'description') video_description = self._html_search_meta('description', webpage, 'description')
@ -46,7 +44,7 @@ class InfoQIE(InfoExtractor):
video_filename = playpath.split('/')[-1] video_filename = playpath.split('/')[-1]
video_id, extension = video_filename.split('.') video_id, extension = video_filename.split('.')
return [{ return {
'id': video_id, 'id': video_id,
'title': video_title, 'title': video_title,
'description': video_description, 'description': video_description,
@ -55,4 +53,4 @@ class InfoQIE(InfoExtractor):
'ext': extension, 'ext': extension,
'play_path': playpath, 'play_path': playpath,
}], }],
}] }