Don't imply -s for later stages of -O

This commit is contained in:
pukkandan 2022-04-20 02:25:33 +05:30
parent e08585b0f8
commit 62f6f1cbf2
No known key found for this signature in database
GPG key ID: 7EEE9E1E817D0A39
4 changed files with 15 additions and 12 deletions

View file

@ -690,9 +690,10 @@ You can also fork the project on github and run your fork's [build workflow](.gi
print it, separated by a ":". Supported print it, separated by a ":". Supported
values of "WHEN" are the same as that of values of "WHEN" are the same as that of
--use-postprocessor, and "video" (default). --use-postprocessor, and "video" (default).
Implies --quiet and --simulate (unless Implies --quiet. Implies --simulate unless
--no-simulate is used). This option can be --no-simulate or later stages of WHEN are
used multiple times used. This option can be used multiple
times
--print-to-file [WHEN:]TEMPLATE FILE --print-to-file [WHEN:]TEMPLATE FILE
Append given template to the file. The Append given template to the file. The
values of WHEN and TEMPLATE are same as values of WHEN and TEMPLATE are same as

View file

@ -28,6 +28,7 @@ from .postprocessor import (
from .update import run_update from .update import run_update
from .utils import ( from .utils import (
NO_DEFAULT, NO_DEFAULT,
POSTPROCESS_WHEN,
DateRange, DateRange,
DownloadCancelled, DownloadCancelled,
DownloadError, DownloadError,
@ -618,11 +619,11 @@ def parse_options(argv=None):
postprocessors = list(get_postprocessors(opts)) postprocessors = list(get_postprocessors(opts))
any_getting = (any(opts.forceprint.values()) or opts.dumpjson or opts.dump_single_json print_only = bool(opts.forceprint) and all(k not in opts.forceprint for k in POSTPROCESS_WHEN[2:])
or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail any_getting = any(getattr(opts, k) for k in (
or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration) 'dumpjson', 'dump_single_json', 'getdescription', 'getduration', 'getfilename',
'getformat', 'getid', 'getthumbnail', 'gettitle', 'geturl'
any_printing = opts.print_json ))
final_ext = ( final_ext = (
opts.recodevideo if opts.recodevideo in FFmpegVideoConvertorPP.SUPPORTED_EXTS opts.recodevideo if opts.recodevideo in FFmpegVideoConvertorPP.SUPPORTED_EXTS
@ -640,7 +641,7 @@ def parse_options(argv=None):
'ap_mso': opts.ap_mso, 'ap_mso': opts.ap_mso,
'ap_username': opts.ap_username, 'ap_username': opts.ap_username,
'ap_password': opts.ap_password, 'ap_password': opts.ap_password,
'quiet': (opts.quiet or any_getting or any_printing), 'quiet': opts.quiet or any_getting or opts.print_json or bool(opts.forceprint),
'no_warnings': opts.no_warnings, 'no_warnings': opts.no_warnings,
'forceurl': opts.geturl, 'forceurl': opts.geturl,
'forcetitle': opts.gettitle, 'forcetitle': opts.gettitle,
@ -655,7 +656,7 @@ def parse_options(argv=None):
'forcejson': opts.dumpjson or opts.print_json, 'forcejson': opts.dumpjson or opts.print_json,
'dump_single_json': opts.dump_single_json, 'dump_single_json': opts.dump_single_json,
'force_write_download_archive': opts.force_write_download_archive, 'force_write_download_archive': opts.force_write_download_archive,
'simulate': (any_getting or None) if opts.simulate is None else opts.simulate, 'simulate': (print_only or any_getting or None) if opts.simulate is None else opts.simulate,
'skip_download': opts.skip_download, 'skip_download': opts.skip_download,
'format': opts.format, 'format': opts.format,
'allow_unplayable_formats': opts.allow_unplayable_formats, 'allow_unplayable_formats': opts.allow_unplayable_formats,

View file

@ -932,7 +932,8 @@ def create_parser():
}, help=( }, help=(
'Field name or output template to print to screen, optionally prefixed with when to print it, separated by a ":". ' 'Field name or output template to print to screen, optionally prefixed with when to print it, separated by a ":". '
'Supported values of "WHEN" are the same as that of --use-postprocessor, and "video" (default). ' 'Supported values of "WHEN" are the same as that of --use-postprocessor, and "video" (default). '
'Implies --quiet and --simulate (unless --no-simulate is used). This option can be used multiple times')) 'Implies --quiet. Implies --simulate unless --no-simulate or later stages of WHEN are used. '
'This option can be used multiple times'))
verbosity.add_option( verbosity.add_option(
'--print-to-file', '--print-to-file',
metavar='[WHEN:]TEMPLATE FILE', dest='print_to_file', default={}, type='str', nargs=2, metavar='[WHEN:]TEMPLATE FILE', dest='print_to_file', default={}, type='str', nargs=2,

View file

@ -3013,7 +3013,7 @@ def qualities(quality_ids):
return q return q
POSTPROCESS_WHEN = {'pre_process', 'after_filter', 'before_dl', 'after_move', 'post_process', 'after_video', 'playlist'} POSTPROCESS_WHEN = ('pre_process', 'after_filter', 'before_dl', 'after_move', 'post_process', 'after_video', 'playlist')
DEFAULT_OUTTMPL = { DEFAULT_OUTTMPL = {