[youtube] Prefer videos with sound

This commit is contained in:
Philipp Hagemeister 2013-12-23 04:51:42 +01:00
parent bc2103f3bf
commit d80044c235

View file

@ -1432,10 +1432,17 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
'height': height, 'height': height,
'format_note': note, 'format_note': note,
}) })
def _formats_key(f): def _formats_key(f):
return (f.get('height') if f.get('height') is not None else -1, note = f.get('format_note')
if note is None:
note = u''
is_dash = u'DASH' in note
return (
0 if is_dash else 1,
f.get('height') if f.get('height') is not None else -1,
f.get('width') if f.get('width') is not None else -1) f.get('width') if f.get('width') is not None else -1)
formats = sorted(formats, key=_formats_key) formats.sort(key=_formats_key)
return { return {
'id': video_id, 'id': video_id,