yt_dlp/__init__.py

@@ -73,16 +73,14 @@ def _exit(status=0, *args):
 
 
 def get_urls(urls, batchfile, verbose):
-    """
+    # Batch file verification
-    @param verbose      -1: quiet, 0: normal, 1: verbose
-    """
     batch_urls = []
     if batchfile is not None:
         try:
             batch_urls = read_batch_urls(
-                read_stdin(None if verbose == -1 else 'URLs') if batchfile == '-'
+                read_stdin('URLs') if batchfile == '-'
                 else open(expand_path(batchfile), encoding='utf-8', errors='ignore'))
-            if verbose == 1:
+            if verbose:
                 write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
         except OSError:
             _exit(f'ERROR: batch file {batchfile} could not be read')
@@ -723,7 +721,7 @@ ParsedOptions = collections.namedtuple('ParsedOptions', ('parser', 'options', 'u
 def parse_options(argv=None):
     """@returns ParsedOptions(parser, opts, urls, ydl_opts)"""
     parser, opts, urls = parseOpts(argv)
-    urls = get_urls(urls, opts.batchfile, -1 if opts.quiet and not opts.verbose else opts.verbose)
+    urls = get_urls(urls, opts.batchfile, opts.verbose)
 
     set_compat_opts(opts)
     try:

yt_dlp/utils/_utils.py

@@ -4789,9 +4789,8 @@ def parse_http_range(range):
 
 
 def read_stdin(what):
-    if what:
+    eof = 'Ctrl+Z' if compat_os_name == 'nt' else 'Ctrl+D'
-        eof = 'Ctrl+Z' if compat_os_name == 'nt' else 'Ctrl+D'
+    write_string(f'Reading {what} from STDIN - EOF ({eof}) to end:\n')
-        write_string(f'Reading {what} from STDIN - EOF ({eof}) to end:\n')
     return sys.stdin
 
 

yt_dlp/webvtt.py

@@ -95,7 +95,6 @@ _REGEX_TS = re.compile(r'''(?x)
 _REGEX_EOF = re.compile(r'\Z')
 _REGEX_NL = re.compile(r'(?:\r\n|[\r\n]|$)')
 _REGEX_BLANK = re.compile(r'(?:\r\n|[\r\n])+')
-_REGEX_OPTIONAL_WHITESPACE = re.compile(r'[ \t]*')
 
 
 def _parse_ts(ts):
@@ -286,7 +285,6 @@ class CueBlock(Block):
         m1 = parser.consume(_REGEX_TS)
         if not m1:
             return None
-        parser.consume(_REGEX_OPTIONAL_WHITESPACE)
         m2 = parser.consume(cls._REGEX_SETTINGS)
         if not parser.consume(_REGEX_NL):
             return None