[wistia] Skip storyboard and improve extraction

This commit is contained in:
Sergey M․ 2016-05-20 21:04:01 +06:00
parent f0c96af9cb
commit 36ca2c55db
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -49,19 +49,23 @@ def _real_extract(self, url):
formats = [] formats = []
thumbnails = [] thumbnails = []
for a in data['assets']: for a in data['assets']:
aurl = a.get('url')
if not aurl:
continue
astatus = a.get('status') astatus = a.get('status')
atype = a.get('type') atype = a.get('type')
if (astatus is not None and astatus != 2) or atype == 'preview': if (astatus is not None and astatus != 2) or atype in ('preview', 'storyboard'):
continue continue
elif atype in ('still', 'still_image'): elif atype in ('still', 'still_image'):
thumbnails.append({ thumbnails.append({
'url': a['url'], 'url': aurl,
'resolution': '%dx%d' % (a['width'], a['height']), 'width': int_or_none(a.get('width')),
'height': int_or_none(a.get('height')),
}) })
else: else:
formats.append({ formats.append({
'format_id': atype, 'format_id': atype,
'url': a['url'], 'url': aurl,
'tbr': int_or_none(a.get('bitrate')), 'tbr': int_or_none(a.get('bitrate')),
'vbr': int_or_none(a.get('opt_vbitrate')), 'vbr': int_or_none(a.get('opt_vbitrate')),
'width': int_or_none(a.get('width')), 'width': int_or_none(a.get('width')),