Add more checks for --min/max-sleep-interval arguments and use more idiomatic naming

1 files changed, 8 insertions, 4 deletions

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 86af18d33..a9730292c 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -147,10 +147,14 @@ def _real_main(argv=None):
         opts.max_filesize = numeric_limit
     if opts.sleep_interval is not None:
         if opts.sleep_interval < 0:
-            parser.error('sleep interval should not be negative')
-        elif opts.max_sleep_interval is not None:
-            if opts.max_sleep_interval < opts.sleep_interval:
-                parser.error('max sleep interval should not be less than sleep interval')
+            parser.error('sleep interval must be positive or 0')
+    if opts.max_sleep_interval is not None:
+        if opts.max_sleep_interval < 0:
+            parser.error('max sleep interval must be positive or 0')
+        if opts.max_sleep_interval < opts.sleep_interval:
+            parser.error('max sleep interval must be greater than or equal to min sleep interval')
+    else:
+        opts.max_sleep_interval = opts.sleep_interval
 
     def parse_retries(retries):
         if retries in ('inf', 'infinite'):