R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

--get-* are deprecated, use --simulate --print-*

Browse Source 
Here we deprecate --get-* options and propose to use --simulate --print-* instead, which will do the same work but allowing to run once youtube-dl to get some information *and* download, that way we don’t keep backward compatibility (for some time, maybe we could remove these after a major version release?) still allowing this new feature.
This commit is contained in:
Garreau Alexandre 2014-05-02 18:50:23 +02:00
parent dfbab5f6b7
commit 7f86b7f0da
1 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
youtube_dl/__init__.py
View File

@ -383,29 +383,53 @@ def parseOpts(overrideArguments=None):
verbosity.add_option('--skip-download', verbosity.add_option('--skip-download',
action='store_true', dest='skip_download', help='do not download the video', default=False) action='store_true', dest='skip_download', help='do not download the video', default=False)
verbosity.add_option('-g', '--get-url', verbosity.add_option('-g', '--get-url',
action='store_true', dest='geturl', help='Be quiet but print URL', default=False) action='store_true', dest='geturl', help='simulate, quiet but print URL (deprecated, use --print-url or -G with --simulate instead)', default=False)
verbosity.add_option('-e', '--get-title', verbosity.add_option('-e', '--get-title',
action='store_true', dest='gettitle', help='Be quiet but print title', default=False) action='store_true', dest='gettitle', help='simulate, quiet but print title (deprecated, use --print-title or -E with --simulate instead)', default=False)
verbosity.add_option('--get-id', verbosity.add_option('--get-id',
action='store_true', dest='getid', help='Be quiet but print id', default=False) action='store_true', dest='getid', help='simulate, quiet but print id (deprecated, use --print-id with --simulate instead)', default=False)
verbosity.add_option('--get-thumbnail', verbosity.add_option('--get-thumbnail',
action='store_true', dest='getthumbnail', action='store_true', dest='getthumbnail',
help='Be quiet but print thumbnail URL', default=False) help='simulate, quiet but print thumbnail URL (deprecated, use --print-thumbnail with --simulate instead)', default=False)
verbosity.add_option('--get-description', verbosity.add_option('--get-description',
action='store_true', dest='getdescription', action='store_true', dest='getdescription',
help='Be quiet but print video description', default=False) help='simulate, quiet but print video description (deprecated, use --print-description with --simulate instead)', default=False)
verbosity.add_option('--get-duration', verbosity.add_option('--get-duration',
action='store_true', dest='getduration', action='store_true', dest='getduration',
help='Be quiet but print video length', default=False) help='simulate, quiet but print video length (deprecated, use --print-duration with --simulate instead)', default=False)
verbosity.add_option('--get-filename', verbosity.add_option('--get-filename',
action='store_true', dest='getfilename', action='store_true', dest='getfilename',
help='Be quiet but print output filename', default=False) help='simulate, quiet but print output filename (deprecated, use --print-filename with --simulate instead)', default=False)
verbosity.add_option('--get-format', verbosity.add_option('--get-format',
action='store_true', dest='getformat', action='store_true', dest='getformat',
help='Be quiet but print output format', default=False) help='simulate, quiet but print output format (deprecated, use --print-format with --simulate instead)', default=False)
verbosity.add_option('-j', '--dump-json', verbosity.add_option('-j', '--dump-json',
action='store_true', dest='dumpjson', action='store_true', dest='dumpjson',
help='Be quiet but print JSON information. See --output for a description of available keys.', default=False) help='simulate, quiet but print JSON information (deprecated, use --print-json or -J with --simulate instead).', default=False)
verbosity.add_option('-G', '--print-url',
action='store_true', dest='printurl', help='be quiet but print URL', default=False)
verbosity.add_option('-E', '--print-title',
action='store_true', dest='printtitle', help='be quiet but print title', default=False)
verbosity.add_option('--print-id',
action='store_true', dest='printid', help='be quiet but print id', default=False)
verbosity.add_option('--print-thumbnail',
action='store_true', dest='printthumbnail',
help='be quiet but print thumbnail URL', default=False)
verbosity.add_option('--print-description',
action='store_true', dest='printdescription',
help='be quiet but print video description', default=False)
verbosity.add_option('--print-duration',
action='store_true', dest='printduration',
help='be quiet but print video length', default=False)
verbosity.add_option('--print-filename',
action='store_true', dest='printfilename',
help='be quiet but print output filename', default=False)
verbosity.add_option('--print-format',
action='store_true', dest='printformat',
help='be quiet but print output format', default=False)
verbosity.add_option('-J', '--print-json',
action='store_true', dest='printjson',
help='be quiet but print JSON information. See --output for a description of available keys.', default=False)
verbosity.add_option('--newline', verbosity.add_option('--newline',
action='store_true', dest='progress_with_newline', help='output progress bar as new lines', default=False) action='store_true', dest='progress_with_newline', help='output progress bar as new lines', default=False)
verbosity.add_option('--no-progress', verbosity.add_option('--no-progress',
@ -713,27 +737,35 @@ def _real_main(argv=None):
u' file! Use "{0}.%(ext)s" instead of "{0}" as the output' u' file! Use "{0}.%(ext)s" instead of "{0}" as the output'
u' template'.format(outtmpl)) u' 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 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
download_archive_fn = os.path.expanduser(opts.download_archive) if opts.download_archive is not None else opts.download_archive download_archive_fn = os.path.expanduser(opts.download_archive) if opts.download_archive is not None else opts.download_archive
if any_getting:
self.report_warning('--get-* options and their short counterparts are deprecated, please use their --print-* alternative with --simulate.')
ydl_opts = { ydl_opts = {
'usenetrc': opts.usenetrc, 'usenetrc': opts.usenetrc,
'username': opts.username, 'username': opts.username,
'password': opts.password, 'password': opts.password,
'videopassword': opts.videopassword, 'videopassword': opts.videopassword,
'quiet': (opts.quiet or any_printing), 'quiet': (opts.quiet or any_getting or
(opts.printurl or opts.printtitle or
opts.printid or opts.printthumbnail or
opts.printdescription or opts.printfilename or
opts.printformat or opts.printduration or
opts.printjson)),
'no_warnings': opts.no_warnings, 'no_warnings': opts.no_warnings,
'forceurl': opts.geturl, 'forceurl': (opts.geturl or opts.printurl),
'forcetitle': opts.gettitle, 'forcetitle': (opts.gettitle or opts.printtitle),
'forceid': opts.getid, 'forceid': (opts.getid or opts.printid),
'forcethumbnail': opts.getthumbnail, 'forcethumbnail': (opts.getthumbnail or opts.printthumbnail),
'forcedescription': opts.getdescription, 'forcedescription': (opts.getdescription or opts.printdescription),
'forceduration': opts.getduration, 'forceduration': (opts.getduration or opts.printduration),
'forcefilename': opts.getfilename, 'forcefilename': (opts.getfilename or opts.printfilename),
'forceformat': opts.getformat, 'forceformat': (opts.getformat or opts.printformat),
'forcejson': opts.dumpjson, 'forcejson': (opts.dumpjson or opts.printjson),
'simulate': opts.simulate, 'simulate': opts.simulate,
'skip_download': (opts.skip_download or opts.simulate), 'skip_download': (opts.skip_download or opts.simulate or any_getting),
'format': opts.format, 'format': opts.format,
'format_limit': opts.format_limit, 'format_limit': opts.format_limit,
'listformats': opts.listformats, 'listformats': opts.listformats,
@ -798,6 +830,7 @@ def _real_main(argv=None):
'encoding': opts.encoding, 'encoding': opts.encoding,
} }
with YoutubeDL(ydl_opts) as ydl: with YoutubeDL(ydl_opts) as ydl:
ydl.print_debug_header() ydl.print_debug_header()
ydl.add_default_info_extractors() ydl.add_default_info_extractors()