From dfbab5f6b79df491eed5f09ed8ee9854e4a08f4b Mon Sep 17 00:00:00 2001 From: Garreau Alexandre Date: Thu, 1 May 2014 22:31:02 +0200 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20simulate=20when=20a=20quiet=20p?= =?UTF-8?q?rinting=20is=20asked?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It would be really usefull to be able to print arbitrary information without having to run youtube-dl a second time to download the video. This way we still can quietly print and simulate using both --simulate and --get-*. --- youtube_dl/__init__.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 74b43b41d..301bacdc8 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -383,29 +383,29 @@ def parseOpts(overrideArguments=None): verbosity.add_option('--skip-download', action='store_true', dest='skip_download', help='do not download the video', default=False) verbosity.add_option('-g', '--get-url', - action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False) + action='store_true', dest='geturl', help='Be quiet but print URL', default=False) verbosity.add_option('-e', '--get-title', - action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False) + action='store_true', dest='gettitle', help='Be quiet but print title', default=False) verbosity.add_option('--get-id', - action='store_true', dest='getid', help='simulate, quiet but print id', default=False) + action='store_true', dest='getid', help='Be quiet but print id', default=False) verbosity.add_option('--get-thumbnail', action='store_true', dest='getthumbnail', - help='simulate, quiet but print thumbnail URL', default=False) + help='Be quiet but print thumbnail URL', default=False) verbosity.add_option('--get-description', action='store_true', dest='getdescription', - help='simulate, quiet but print video description', default=False) + help='Be quiet but print video description', default=False) verbosity.add_option('--get-duration', action='store_true', dest='getduration', - help='simulate, quiet but print video length', default=False) + help='Be quiet but print video length', default=False) verbosity.add_option('--get-filename', action='store_true', dest='getfilename', - help='simulate, quiet but print output filename', default=False) + help='Be quiet but print output filename', default=False) verbosity.add_option('--get-format', action='store_true', dest='getformat', - help='simulate, quiet but print output format', default=False) + help='Be quiet but print output format', default=False) verbosity.add_option('-j', '--dump-json', action='store_true', dest='dumpjson', - help='simulate, quiet but print JSON information. See --output for a description of available keys.', default=False) + help='Be quiet but print JSON information. See --output for a description of available keys.', default=False) verbosity.add_option('--newline', action='store_true', dest='progress_with_newline', help='output progress bar as new lines', default=False) verbosity.add_option('--no-progress', @@ -733,7 +733,7 @@ def _real_main(argv=None): 'forceformat': opts.getformat, 'forcejson': opts.dumpjson, 'simulate': opts.simulate, - 'skip_download': (opts.skip_download or opts.simulate or any_printing), + 'skip_download': (opts.skip_download or opts.simulate), 'format': opts.format, 'format_limit': opts.format_limit, 'listformats': opts.listformats,