[ted] Prepare #980 merge

This commit is contained in:
Philipp Hagemeister 2013-10-04 10:32:34 +02:00
parent 3cd022f6e6
commit 0d8cb1cc14

View file

@ -77,12 +77,20 @@ def _talk_info(self, url, video_id=0):
thumbnail = self._search_regex(r'</span>[\s.]*</div>[\s.]*<img src="(.*?)"',
webpage, 'thumbnail')
formats = [{
'ext': 'mp4',
'url': stream['file'],
'format': stream['id']
} for stream in info['htmlStreams']]
info = {
'id': info['id'],
'url': info['htmlStreams'][-1]['file'],
'ext': 'mp4',
'title': title,
'thumbnail': thumbnail,
'description': desc,
'formats': formats,
}
# TODO: Remove when #980 has been merged
info.update(info['formats'][-1])
return info