Extend #980 with --max-quality support

2 files changed, 12 insertions, 1 deletions

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index f22a8bd0e..fd98321f1 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -488,7 +488,9 @@ class YoutubeDL(object):
 
         format_limit = self.params.get('format_limit', None)
         if format_limit:
-            formats = [f for f in formats if f['format_id'] <= format_limit]
+            formats = list(takewhile_inclusive(
+                lambda f: f['format_id'] != format_limit, formats
+            ))
         if self.params.get('prefer_free_formats'):
             def _free_formats_key(f):
                 try:
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 833f981f2..bfb8f6bcd 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -947,6 +947,15 @@ def shell_quote(args):
     return ' '.join(map(pipes.quote, args))
 
 
+def takewhile_inclusive(pred, seq):
+    """ Like itertools.takewhile, but include the latest evaluated element
+        (the first element so that Not pred(e)) """
+    for e in seq:
+        yield e
+        if not pred(e):
+            return
+
+
 def smuggle_url(url, data):
     """ Pass additional data in a URL for internal use. """