From f4d96df0f1e978d580197fafb8dacade4b611ef3 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 18 Oct 2013 00:46:35 +0200
Subject: Extend #980 with --max-quality support

---
 test/helper.py          |  4 ++--
 test/test_YoutubeDL.py  | 43 +++++++++++++++++++++++++++++++++++++++++--
 youtube_dl/YoutubeDL.py |  4 +++-
 youtube_dl/utils.py     |  9 +++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/test/helper.py b/test/helper.py
index 79a0ede48..777119ea5 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -34,10 +34,10 @@ def try_rm(filename):
 
 
 class FakeYDL(YoutubeDL):
-    def __init__(self):
+    def __init__(self, override=None):
         # Different instances of the downloader can't share the same dictionary
         # some test set the "sublang" parameter, which would break the md5 checks.
-        params = get_params()
+        params = get_params(override=override)
         super(FakeYDL, self).__init__(params)
         self.result = []
         
diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index ee210ed23..ba6dc05bc 100644
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -10,13 +10,17 @@ from test.helper import FakeYDL
 
 
 class YDL(FakeYDL):
-    def __init__(self):
-        super(YDL, self).__init__()
+    def __init__(self, *args, **kwargs):
+        super(YDL, self).__init__(*args, **kwargs)
         self.downloaded_info_dicts = []
+        self.msgs = []
 
     def process_info(self, info_dict):
         self.downloaded_info_dicts.append(info_dict)
 
+    def to_screen(self, msg):
+        self.msgs.append(msg)
+
 
 class TestFormatSelection(unittest.TestCase):
     def test_prefer_free_formats(self):
@@ -56,5 +60,40 @@ class TestFormatSelection(unittest.TestCase):
         downloaded = ydl.downloaded_info_dicts[0]
         self.assertEqual(downloaded[u'ext'], u'flv')
 
+    def test_format_limit(self):
+        formats = [
+            {u'format_id': u'meh'},
+            {u'format_id': u'good'},
+            {u'format_id': u'great'},
+            {u'format_id': u'excellent'},
+        ]
+        info_dict = {
+            u'formats': formats, u'extractor': u'test', 'id': 'testvid'}
+
+        ydl = YDL()
+        ydl.process_ie_result(info_dict)
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded[u'format_id'], u'excellent')
+
+        ydl = YDL({'format_limit': 'good'})
+        assert ydl.params['format_limit'] == 'good'
+        ydl.process_ie_result(info_dict)
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded[u'format_id'], u'good')
+
+        ydl = YDL({'format_limit': 'great', 'format': 'all'})
+        ydl.process_ie_result(info_dict)
+        self.assertEqual(ydl.downloaded_info_dicts[0][u'format_id'], u'meh')
+        self.assertEqual(ydl.downloaded_info_dicts[1][u'format_id'], u'good')
+        self.assertEqual(ydl.downloaded_info_dicts[2][u'format_id'], u'great')
+        self.assertTrue('3' in ydl.msgs[0])
+
+        ydl = YDL()
+        ydl.params['format_limit'] = 'excellent'
+        ydl.process_ie_result(info_dict)
+        downloaded = ydl.downloaded_info_dicts[0]
+        self.assertEqual(downloaded[u'format_id'], u'excellent')
+
+
 if __name__ == '__main__':
     unittest.main()
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. """
 
-- 
cgit v1.2.3