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

completed conversion to docopt for all general options

Browse Source
This commit is contained in:
SavinaRoja 2013-10-06 00:28:12 -04:00
parent 096f816c6c
commit 20779cfbae
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
youtube_dl/__init__.py
View File

@ -327,17 +327,17 @@ def parseOpts(overrideArguments=None):
filesystem = optparse.OptionGroup(parser, 'Filesystem Options') filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options') verbosity = optparse.OptionGroup(parser, 'Verbosity / Simulation Options')
general.add_option('-h', '--help', #general.add_option('-h', '--help',
action='help', help='print this help text and exit') # action='help', help='print this help text and exit')
general.add_option('-v', '--version', #general.add_option('-v', '--version',
action='version', help='print program version and exit') # action='version', help='print program version and exit')
general.add_option('-U', '--update', #general.add_option('-U', '--update',
action='store_true', dest='update_self', help='update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)') # action='store_true', dest='update_self', help='update this program to latest version. Make sure that you have sufficient permissions (run with sudo if needed)')
general.add_option('-i', '--ignore-errors', #general.add_option('-i', '--ignore-errors',
action='store_true', dest='ignoreerrors', help='continue on download errors', default=False) # action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
general.add_option('--dump-user-agent', #general.add_option('--dump-user-agent',
action='store_true', dest='dump_user_agent', # action='store_true', dest='dump_user_agent',
help='display the current browser identification', default=False) # help='display the current browser identification', default=False)
#general.add_option('--user-agent', #general.add_option('--user-agent',
# dest='user_agent', help='specify a custom user agent', metavar='UA') # dest='user_agent', help='specify a custom user agent', metavar='UA')
#general.add_option('--referer', #general.add_option('--referer',
@ -593,7 +593,7 @@ def _real_main(argv=None):
std_headers['Referer'] = opts['--referer'] std_headers['Referer'] = opts['--referer']
# Dump user agent # Dump user agent
if opts.dump_user_agent: if opts['--dump-user-agent']:
compat_print(std_headers['User-Agent']) compat_print(std_headers['User-Agent'])
sys.exit(0) sys.exit(0)
@ -760,7 +760,7 @@ def _real_main(argv=None):
'outtmpl': outtmpl, 'outtmpl': outtmpl,
'autonumber_size': opts.autonumber_size, 'autonumber_size': opts.autonumber_size,
'restrictfilenames': opts.restrictfilenames, 'restrictfilenames': opts.restrictfilenames,
'ignoreerrors': opts.ignoreerrors, 'ignoreerrors': opts['--ignore-errors'],
'ratelimit': opts['--rate-limit'], 'ratelimit': opts['--rate-limit'],
'nooverwrites': opts.nooverwrites, 'nooverwrites': opts.nooverwrites,
'retries': opts.retries, 'retries': opts.retries,
@ -827,12 +827,12 @@ def _real_main(argv=None):
ydl.add_post_processor(FFmpegEmbedSubtitlePP(subtitlesformat=opts.subtitlesformat)) ydl.add_post_processor(FFmpegEmbedSubtitlePP(subtitlesformat=opts.subtitlesformat))
# Update version # Update version
if opts.update_self: if opts['--update']:
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:
if not opts.update_self: if not opts['--update']:
parser.error(u'you must provide at least one URL') parser.error(u'you must provide at least one URL')
else: else:
sys.exit() sys.exit()