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