diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-12-23 04:51:42 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-12-23 04:51:42 +0100 |
| commit | d80044c235afcbcfa905ab08a82f6f972df25268 (patch) | |
| tree | d4bb3c451e5dd9202c4573e02e77ae4a3d043783 | |
| parent | bc2103f3bf2aafdf28897a935a837e817f389626 (diff) | |
| download | youtube-dl-d80044c235afcbcfa905ab08a82f6f972df25268.tar.gz youtube-dl-d80044c235afcbcfa905ab08a82f6f972df25268.tar.xz youtube-dl-d80044c235afcbcfa905ab08a82f6f972df25268.zip | |
[youtube] Prefer videos with sound
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 9fb07b366..55c345e8a 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1432,10 +1432,17 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): 'height': height, 'format_note': note, }) + def _formats_key(f): - return (f.get('height') if f.get('height') is not None else -1, - f.get('width') if f.get('width') is not None else -1) - formats = sorted(formats, key=_formats_key) + 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) + formats.sort(key=_formats_key) return { 'id': video_id, |