|
@@ -197,7 +197,8 @@ def _real_main(argv=None):
|
|
|
' file! Use "{0}.%(ext)s" instead of "{0}" as the output'
|
|
|
' template'.format(outtmpl))
|
|
|
|
|
|
- any_printing = opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson or opts.dump_single_json
|
|
|
+ any_getting = opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat or opts.getduration or opts.dumpjson or opts.dump_single_json
|
|
|
+ any_printing = opts.print_json
|
|
|
download_archive_fn = compat_expanduser(opts.download_archive) if opts.download_archive is not None else opts.download_archive
|
|
|
|
|
|
# PostProcessors
|
|
@@ -243,7 +244,7 @@ def _real_main(argv=None):
|
|
|
'password': opts.password,
|
|
|
'twofactor': opts.twofactor,
|
|
|
'videopassword': opts.videopassword,
|
|
|
- 'quiet': (opts.quiet or any_printing),
|
|
|
+ 'quiet': (opts.quiet or any_getting or any_printing),
|
|
|
'no_warnings': opts.no_warnings,
|
|
|
'forceurl': opts.geturl,
|
|
|
'forcetitle': opts.gettitle,
|
|
@@ -253,9 +254,9 @@ def _real_main(argv=None):
|
|
|
'forceduration': opts.getduration,
|
|
|
'forcefilename': opts.getfilename,
|
|
|
'forceformat': opts.getformat,
|
|
|
- 'forcejson': opts.dumpjson,
|
|
|
+ 'forcejson': opts.dumpjson or opts.print_json,
|
|
|
'dump_single_json': opts.dump_single_json,
|
|
|
- 'simulate': opts.simulate or any_printing,
|
|
|
+ 'simulate': opts.simulate or any_getting,
|
|
|
'skip_download': opts.skip_download,
|
|
|
'format': opts.format,
|
|
|
'format_limit': opts.format_limit,
|