Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-19 18:32:52 +08:00
Code Issues Releases Wiki Activity

Converted all verbosity group options to docopt

Browse Source
This commit is contained in:
SavinaRoja 2013-10-05 23:55:48 -04:00
parent 1ed905fbd1
commit f2f43bee10
1 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
youtube_dl/__init__.py
View File

@ -419,42 +419,42 @@ def parseOpts(overrideArguments=None):
help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False) help='do not automatically adjust the buffer size. By default, the buffer size is automatically resized from an initial value of SIZE.', default=False)
downloader.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP) downloader.add_option('--test', action='store_true', dest='test', default=False, help=optparse.SUPPRESS_HELP)
verbosity.add_option('-q', '--quiet', #verbosity.add_option('-q', '--quiet',
action='store_true', dest='quiet', help='activates quiet mode', default=False) # action='store_true', dest='quiet', help='activates quiet mode', default=False)
verbosity.add_option('-s', '--simulate', #verbosity.add_option('-s', '--simulate',
action='store_true', dest='simulate', help='do not download the video and do not write anything to disk', default=False) # action='store_true', dest='simulate', help='do not download the video and do not write anything to disk', default=False)
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='simulate, quiet but print URL', default=False) # action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
verbosity.add_option('-e', '--get-title', #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='simulate, quiet but print title', default=False)
verbosity.add_option('--get-id', #verbosity.add_option('--get-id',
action='store_true', dest='getid', help='simulate, quiet but print id', default=False) # action='store_true', dest='getid', help='simulate, quiet but print id', default=False)
verbosity.add_option('--get-thumbnail', #verbosity.add_option('--get-thumbnail',
action='store_true', dest='getthumbnail', # action='store_true', dest='getthumbnail',
help='simulate, quiet but print thumbnail URL', default=False) # help='simulate, quiet but print thumbnail URL', default=False)
verbosity.add_option('--get-description', #verbosity.add_option('--get-description',
action='store_true', dest='getdescription', # action='store_true', dest='getdescription',
help='simulate, quiet but print video description', default=False) # help='simulate, quiet but print video description', default=False)
verbosity.add_option('--get-filename', #verbosity.add_option('--get-filename',
action='store_true', dest='getfilename', # action='store_true', dest='getfilename',
help='simulate, quiet but print output filename', default=False) # help='simulate, quiet but print output filename', default=False)
verbosity.add_option('--get-format', #verbosity.add_option('--get-format',
action='store_true', dest='getformat', # action='store_true', dest='getformat',
help='simulate, quiet but print output format', default=False) # help='simulate, quiet but print output format', 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',
action='store_true', dest='noprogress', help='do not print progress bar', default=False) # action='store_true', dest='noprogress', help='do not print progress bar', default=False)
verbosity.add_option('--console-title', #verbosity.add_option('--console-title',
action='store_true', dest='consoletitle', # action='store_true', dest='consoletitle',
help='display progress in console titlebar', default=False) # help='display progress in console titlebar', default=False)
verbosity.add_option('-v', '--verbose', #verbosity.add_option('-v', '--verbose',
action='store_true', dest='verbose', help='print various debugging information', default=False) # action='store_true', dest='verbose', help='print various debugging information', default=False)
verbosity.add_option('--dump-intermediate-pages', #verbosity.add_option('--dump-intermediate-pages',
action='store_true', dest='dump_intermediate_pages', default=False, # action='store_true', dest='dump_intermediate_pages', default=False,
help='print downloaded pages to debug problems(very verbose)') # help='print downloaded pages to debug problems(very verbose)')
#filesystem.add_option('-t', '--title', #filesystem.add_option('-t', '--title',
# action='store_true', dest='usetitle', help='use title in file name (default)', default=False) # action='store_true', dest='usetitle', help='use title in file name (default)', default=False)
@ -537,7 +537,7 @@ def parseOpts(overrideArguments=None):
if overrideArguments is not None: if overrideArguments is not None:
opts, args = parser.parse_args(overrideArguments) opts, args = parser.parse_args(overrideArguments)
if opts.verbose: if opts['--verbose']:
sys.stderr.write(u'[debug] Override config: ' + repr(overrideArguments) + '\n') sys.stderr.write(u'[debug] Override config: ' + repr(overrideArguments) + '\n')
else: else:
xdg_config_home = os.environ.get('XDG_CONFIG_HOME') xdg_config_home = os.environ.get('XDG_CONFIG_HOME')
@ -550,7 +550,7 @@ def parseOpts(overrideArguments=None):
commandLineConf = sys.argv[1:] commandLineConf = sys.argv[1:]
argv = systemConf + userConf + commandLineConf argv = systemConf + userConf + commandLineConf
opts, args = parser.parse_args(argv) opts, args = parser.parse_args(argv)
if opts.verbose: if opts['--verbose']:
sys.stderr.write(u'[debug] System config: ' + repr(_hide_login_info(systemConf)) + '\n') sys.stderr.write(u'[debug] System config: ' + repr(_hide_login_info(systemConf)) + '\n')
sys.stderr.write(u'[debug] User config: ' + repr(_hide_login_info(userConf)) + '\n') sys.stderr.write(u'[debug] User config: ' + repr(_hide_login_info(userConf)) + '\n')
sys.stderr.write(u'[debug] Command-line args: ' + repr(_hide_login_info(commandLineConf)) + '\n') sys.stderr.write(u'[debug] Command-line args: ' + repr(_hide_login_info(commandLineConf)) + '\n')
@ -579,7 +579,7 @@ def _real_main(argv=None):
if os.access(opts['--cookies'], os.R_OK): if os.access(opts['--cookies'], os.R_OK):
jar.load() jar.load()
except (IOError, OSError) as err: except (IOError, OSError) as err:
if opts.verbose: if opts['--verbose']:
traceback.print_exc() traceback.print_exc()
sys.stderr.write(u'ERROR: unable to open cookie file\n') sys.stderr.write(u'ERROR: unable to open cookie file\n')
sys.exit(101) sys.exit(101)
@ -607,7 +607,7 @@ def _real_main(argv=None):
batchurls = batchfd.readlines() batchurls = batchfd.readlines()
batchurls = [x.strip() for x in batchurls] batchurls = [x.strip() for x in batchurls]
batchurls = [x for x in batchurls if len(x) > 0 and not re.search(r'^[#/;]', x)] batchurls = [x for x in batchurls if len(x) > 0 and not re.search(r'^[#/;]', x)]
if opts.verbose: if opts['--verbose']:
sys.stderr.write(u'[debug] Batch file urls: ' + repr(batchurls) + u'\n') sys.stderr.write(u'[debug] Batch file urls: ' + repr(batchurls) + u'\n')
except IOError: except IOError:
sys.exit(u'ERROR: batch file could not be read') sys.exit(u'ERROR: batch file could not be read')
@ -743,16 +743,16 @@ def _real_main(argv=None):
'username': opts['--username'], 'username': opts['--username'],
'password': opts['--password'], 'password': opts['--password'],
'videopassword': opts.videopassword, 'videopassword': opts.videopassword,
'quiet': (opts.quiet or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat), 'quiet': (opts['--quiet'] or opts['--get-url'] or opts['--get-title'] or opts['--get-id'] or opts['--get-thumbnail'] or opts['--get-description'] or opts['--get-filename'] or opts['--get-format']),
'forceurl': opts.geturl, 'forceurl': opts['--get-url'],
'forcetitle': opts.gettitle, 'forcetitle': opts['--get-title'],
'forceid': opts.getid, 'forceid': opts['--get-id'],
'forcethumbnail': opts.getthumbnail, 'forcethumbnail': opts['--get-thumbnail'],
'forcedescription': opts.getdescription, 'forcedescription': opts['--get-description'],
'forcefilename': opts.getfilename, 'forcefilename': opts['--get-filename'],
'forceformat': opts.getformat, 'forceformat': opts['--get-format'],
'simulate': opts.simulate, 'simulate': opts['--simulate'],
'skip_download': (opts.skip_download or opts.simulate or opts.geturl or opts.gettitle or opts.getid or opts.getthumbnail or opts.getdescription or opts.getfilename or opts.getformat), 'skip_download': (opts['--skip-download'] or opts['--simulate'] or opts['--get-url'] or opts['--get-title'] or opts['--get-id'] or opts['--get-thumbnail'] or opts['--get-description'] or opts['--get-filename'] or opts['--get-format']),
'format': opts.format, 'format': opts.format,
'format_limit': opts.format_limit, 'format_limit': opts.format_limit,
'listformats': opts.listformats, 'listformats': opts.listformats,
@ -766,12 +766,12 @@ def _real_main(argv=None):
'buffersize': opts.buffersize, 'buffersize': opts.buffersize,
'noresizebuffer': opts.noresizebuffer, 'noresizebuffer': opts.noresizebuffer,
'continuedl': opts.continue_dl, 'continuedl': opts.continue_dl,
'noprogress': opts.noprogress, 'noprogress': opts['--no-progress'],
'progress_with_newline': opts.progress_with_newline, 'progress_with_newline': opts['--newline'],
'playliststart': opts.playliststart, 'playliststart': opts.playliststart,
'playlistend': opts.playlistend, 'playlistend': opts.playlistend,
'logtostderr': opts['--output'] == '-', 'logtostderr': opts['--output'] == '-',
'consoletitle': opts.consoletitle, 'consoletitle': opts['--console-title'],
'nopart': opts.nopart, 'nopart': opts.nopart,
'updatetime': opts.updatetime, 'updatetime': opts.updatetime,
'writedescription': opts.writedescription, 'writedescription': opts.writedescription,
@ -787,8 +787,8 @@ def _real_main(argv=None):
'rejecttitle': decodeOption(opts.rejecttitle), 'rejecttitle': decodeOption(opts.rejecttitle),
'max_downloads': opts.max_downloads, 'max_downloads': opts.max_downloads,
'prefer_free_formats': opts.prefer_free_formats, 'prefer_free_formats': opts.prefer_free_formats,
'verbose': opts.verbose, 'verbose': opts['--verbose'],
'dump_intermediate_pages': opts.dump_intermediate_pages, 'dump_intermediate_pages': opts['--dump-intermediate-pages'],
'test': opts.test, 'test': opts.test,
'keepvideo': opts.keepvideo, 'keepvideo': opts.keepvideo,
'min_filesize': opts.min_filesize, 'min_filesize': opts.min_filesize,
@ -796,7 +796,7 @@ def _real_main(argv=None):
'daterange': date, 'daterange': date,
}) })
if opts.verbose: if opts['--verbose']:
sys.stderr.write(u'[debug] youtube-dl version ' + __version__ + u'\n') sys.stderr.write(u'[debug] youtube-dl version ' + __version__ + u'\n')
try: try:
sp = subprocess.Popen( sp = subprocess.Popen(
@ -827,7 +827,7 @@ def _real_main(argv=None):
# Update version # Update version
if opts.update_self: if opts.update_self:
update_self(ydl.to_screen, opts.verbose, sys.argv[0]) update_self(ydl.to_screen, opts['--verbose'], sys.argv[0])
# Maybe do nothing # Maybe do nothing
if len(all_urls) < 1: if len(all_urls) < 1: