youtube-dl

commit: d80044c235afcbcfa905ab08a82f6f972df25268
parent bc2103f3bf2aafdf28897a935a837e817f389626
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Mon, 23 Dec 2013 04:51:42 +0100

[youtube] Prefer videos with sound

Diffstat:
M
youtube_dl/extractor/youtube.py
13
++++++++++---

1 file changed, 10 insertions(+), 3 deletions(-)
diff --git 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,