mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-11-04 08:30:46 +00:00 
			
		
		
		
	Don't imply -s for later stages of -O
				
					
				
			This commit is contained in:
		@@ -28,6 +28,7 @@ from .postprocessor import (
 | 
			
		||||
from .update import run_update
 | 
			
		||||
from .utils import (
 | 
			
		||||
    NO_DEFAULT,
 | 
			
		||||
    POSTPROCESS_WHEN,
 | 
			
		||||
    DateRange,
 | 
			
		||||
    DownloadCancelled,
 | 
			
		||||
    DownloadError,
 | 
			
		||||
@@ -618,11 +619,11 @@ def parse_options(argv=None):
 | 
			
		||||
 | 
			
		||||
    postprocessors = list(get_postprocessors(opts))
 | 
			
		||||
 | 
			
		||||
    any_getting = (any(opts.forceprint.values()) or opts.dumpjson or opts.dump_single_json
 | 
			
		||||
                   or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail
 | 
			
		||||
                   or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration)
 | 
			
		||||
 | 
			
		||||
    any_printing = opts.print_json
 | 
			
		||||
    print_only = bool(opts.forceprint) and all(k not in opts.forceprint for k in POSTPROCESS_WHEN[2:])
 | 
			
		||||
    any_getting = any(getattr(opts, k) for k in (
 | 
			
		||||
        'dumpjson', 'dump_single_json', 'getdescription', 'getduration', 'getfilename',
 | 
			
		||||
        'getformat', 'getid', 'getthumbnail', 'gettitle', 'geturl'
 | 
			
		||||
    ))
 | 
			
		||||
 | 
			
		||||
    final_ext = (
 | 
			
		||||
        opts.recodevideo if opts.recodevideo in FFmpegVideoConvertorPP.SUPPORTED_EXTS
 | 
			
		||||
@@ -640,7 +641,7 @@ def parse_options(argv=None):
 | 
			
		||||
        'ap_mso': opts.ap_mso,
 | 
			
		||||
        'ap_username': opts.ap_username,
 | 
			
		||||
        '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,
 | 
			
		||||
        'forceurl': opts.geturl,
 | 
			
		||||
        'forcetitle': opts.gettitle,
 | 
			
		||||
@@ -655,7 +656,7 @@ def parse_options(argv=None):
 | 
			
		||||
        'forcejson': opts.dumpjson or opts.print_json,
 | 
			
		||||
        'dump_single_json': opts.dump_single_json,
 | 
			
		||||
        '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,
 | 
			
		||||
        'format': opts.format,
 | 
			
		||||
        'allow_unplayable_formats': opts.allow_unplayable_formats,
 | 
			
		||||
 
 | 
			
		||||
@@ -932,7 +932,8 @@ def create_parser():
 | 
			
		||||
        }, help=(
 | 
			
		||||
            '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). '
 | 
			
		||||
            '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(
 | 
			
		||||
        '--print-to-file',
 | 
			
		||||
        metavar='[WHEN:]TEMPLATE FILE', dest='print_to_file', default={}, type='str', nargs=2,
 | 
			
		||||
 
 | 
			
		||||
@@ -3013,7 +3013,7 @@ def qualities(quality_ids):
 | 
			
		||||
    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 = {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user