projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0c96af
)
[wistia] Skip storyboard and improve extraction
author
Sergey M․
<dstftw@gmail.com>
Fri, 20 May 2016 15:04:01 +0000
(21:04 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Fri, 20 May 2016 15:04:01 +0000
(21:04 +0600)
youtube_dl/extractor/wistia.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/wistia.py
b/youtube_dl/extractor/wistia.py
index 478c428334d4fc64527606e57e9e04a69211be76..6eb94fcabc1440e3069c9491b5971c3635eae48d 100644
(file)
--- 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']:
formats = []
thumbnails = []
for a in data['assets']:
+ aurl = a.get('url')
+ if not aurl:
+ continue
astatus = a.get('status')
atype = a.get('type')
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({
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,
})
else:
formats.append({
'format_id': atype,
- 'url': a
['url']
,
+ 'url': a
url
,
'tbr': int_or_none(a.get('bitrate')),
'vbr': int_or_none(a.get('opt_vbitrate')),
'width': int_or_none(a.get('width')),
'tbr': int_or_none(a.get('bitrate')),
'vbr': int_or_none(a.get('opt_vbitrate')),
'width': int_or_none(a.get('width')),