diff options
author | Sergey M․ <dstftw@gmail.com> | 2016-05-20 21:04:01 +0600 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2016-05-20 21:04:01 +0600 |
commit | 36ca2c55db7939aff2dc700523843a9a0f82ae2b (patch) | |
tree | 6fd47525bc7aba16eed57777dea6a25c5aae6eee | |
parent | f0c96af9cb0edc69f9ba73d39e6e191994e31256 (diff) |
[wistia] Skip storyboard and improve extraction
-rw-r--r-- | youtube_dl/extractor/wistia.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/youtube_dl/extractor/wistia.py b/youtube_dl/extractor/wistia.py index 478c42833..6eb94fcab 100644 --- a/youtube_dl/extractor/wistia.py +++ b/youtube_dl/extractor/wistia.py @@ -49,19 +49,23 @@ class WistiaIE(InfoExtractor): formats = [] thumbnails = [] for a in data['assets']: + aurl = a.get('url') + if not aurl: + continue astatus = a.get('status') 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 elif atype in ('still', 'still_image'): thumbnails.append({ - 'url': a['url'], - 'resolution': '%dx%d' % (a['width'], a['height']), + 'url': aurl, + 'width': int_or_none(a.get('width')), + 'height': int_or_none(a.get('height')), }) else: formats.append({ 'format_id': atype, - 'url': a['url'], + 'url': aurl, 'tbr': int_or_none(a.get('bitrate')), 'vbr': int_or_none(a.get('opt_vbitrate')), 'width': int_or_none(a.get('width')), |