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

converted a few filesystem options to docopt, --continue and --no-continue have been made mutually exclusive and partial continuation will be skipped only if --no-continue is used

Browse Source
This commit is contained in:
SavinaRoja 2013-10-06 09:58:27 -04:00
parent b3a5c4a3cd
commit e2ab108c21
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
youtube_dl/__init__.py
View File

@ -14,7 +14,7 @@ Usage:
[--retries RETRIES] [--buffer-size SIZE] [--no-resize-buffer] [--retries RETRIES] [--buffer-size SIZE] [--no-resize-buffer]
[[--title --literal | --id] --auto-number | --output TEMPLATE] [[--title --literal | --id] --auto-number | --output TEMPLATE]
[--autonumber-size NUMBER] [--restrict-filenames] [--autonumber-size NUMBER] [--restrict-filenames]
[--batch-file FILE] [--no-overwrites] [--continue] [--no-continue] [--batch-file FILE] [--no-overwrites] [--continue | --no-continue]
[--cookies FILE] [--no-part] [--no-mtime] [--write-description] [--cookies FILE] [--no-part] [--no-mtime] [--write-description]
[--write-info-json] [--write-thumbnail] [--quiet] [--simulate] [--write-info-json] [--write-thumbnail] [--quiet] [--simulate]
[--skip-download] [--get-url] [--get-title] [--get-id] [--skip-download] [--get-url] [--get-title] [--get-id]
@ -477,25 +477,25 @@ def parseOpts(overrideArguments=None):
# '%(playlist_index)s for the position in the playlist and %% for a literal percent. ' # '%(playlist_index)s for the position in the playlist and %% for a literal percent. '
# 'Use - to output to stdout. Can also be used to download to a different directory, ' # 'Use - to output to stdout. Can also be used to download to a different directory, '
# 'for example with -o \'/my/downloads/%(uploader)s/%(title)s-%(id)s.%(ext)s\' .')) # 'for example with -o \'/my/downloads/%(uploader)s/%(title)s-%(id)s.%(ext)s\' .'))
filesystem.add_option('--autonumber-size', #filesystem.add_option('--autonumber-size',
dest='autonumber_size', metavar='NUMBER', # dest='autonumber_size', metavar='NUMBER',
help='Specifies the number of digits in %(autonumber)s when it is present in output filename template or --autonumber option is given') # help='Specifies the number of digits in %(autonumber)s when it is present in output filename template or --autonumber option is given')
filesystem.add_option('--restrict-filenames', #filesystem.add_option('--restrict-filenames',
action='store_true', dest='restrictfilenames', # action='store_true', dest='restrictfilenames',
help='Restrict filenames to only ASCII characters, and avoid "&" and spaces in filenames', default=False) # help='Restrict filenames to only ASCII characters, and avoid "&" and spaces in filenames', default=False)
#filesystem.add_option('-a', '--batch-file', #filesystem.add_option('-a', '--batch-file',
# dest='batchfile', metavar='FILE', help='file containing URLs to download (\'-\' for stdin)') # dest='batchfile', metavar='FILE', help='file containing URLs to download (\'-\' for stdin)')
filesystem.add_option('-w', '--no-overwrites', #filesystem.add_option('-w', '--no-overwrites',
action='store_true', dest='nooverwrites', help='do not overwrite files', default=False) # action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
filesystem.add_option('-c', '--continue', #filesystem.add_option('-c', '--continue',
action='store_true', dest='continue_dl', help='resume partially downloaded files', default=True) # action='store_true', dest='continue_dl', help='resume partially downloaded files', default=True)
filesystem.add_option('--no-continue', #filesystem.add_option('--no-continue',
action='store_false', dest='continue_dl', # action='store_false', dest='continue_dl',
help='do not resume partially downloaded files (restart from beginning)') # help='do not resume partially downloaded files (restart from beginning)')
#filesystem.add_option('--cookies', #filesystem.add_option('--cookies',
# dest='cookiefile', metavar='FILE', help='file to read cookies from and dump cookie jar in') # dest='cookiefile', metavar='FILE', help='file to read cookies from and dump cookie jar in')
filesystem.add_option('--no-part', #filesystem.add_option('--no-part',
action='store_true', dest='nopart', help='do not use .part files', default=False) # action='store_true', dest='nopart', help='do not use .part files', default=False)
filesystem.add_option('--no-mtime', filesystem.add_option('--no-mtime',
action='store_false', dest='updatetime', action='store_false', dest='updatetime',
help='do not use the Last-modified header to set the file modification time', default=True) help='do not use the Last-modified header to set the file modification time', default=True)
@ -571,6 +571,12 @@ def _real_main(argv=None):
#--all-formats will supersede --format #--all-formats will supersede --format
if opts['--all-formats']: if opts['--all-formats']:
opts['--format'] = 'all' opts['--format'] = 'all'
#--continue and --no-continue are mutually exclusive and control the
#partial downloading of files
if opts['--no-continue']:
opts['--continue'] = False
else:
opts['--continue'] = True
#parser, opts, args = parseOpts(argv) #parser, opts, args = parseOpts(argv)
@ -761,22 +767,22 @@ def _real_main(argv=None):
'format_limit': opts['--max-quality'], 'format_limit': opts['--max-quality'],
'listformats': opts['--list-formats'], 'listformats': opts['--list-formats'],
'outtmpl': outtmpl, 'outtmpl': outtmpl,
'autonumber_size': opts.autonumber_size, 'autonumber_size': opts['--autonumber-size'],
'restrictfilenames': opts.restrictfilenames, 'restrictfilenames': opts['--restrict-filenames'],
'ignoreerrors': opts['--ignore-errors'], 'ignoreerrors': opts['--ignore-errors'],
'ratelimit': opts['--rate-limit'], 'ratelimit': opts['--rate-limit'],
'nooverwrites': opts.nooverwrites, 'nooverwrites': opts['--no-overwrites'],
'retries': opts['--retries'], 'retries': opts['--retries'],
'buffersize': opts['--buffer-size'], 'buffersize': opts['--buffer-size'],
'noresizebuffer': opts['--no-resize-buffer'], 'noresizebuffer': opts['--no-resize-buffer'],
'continuedl': opts.continue_dl, 'continuedl': opts['--continue'],
'noprogress': opts['--no-progress'], 'noprogress': opts['--no-progress'],
'progress_with_newline': opts['--newline'], 'progress_with_newline': opts['--newline'],
'playliststart': opts['--playlist-start'], 'playliststart': opts['--playlist-start'],
'playlistend': opts['--playlist-end'], 'playlistend': opts['--playlist-end'],
'logtostderr': opts['--output'] == '-', 'logtostderr': opts['--output'] == '-',
'consoletitle': opts['--console-title'], 'consoletitle': opts['--console-title'],
'nopart': opts.nopart, 'nopart': opts['--no-part'],
'updatetime': opts.updatetime, 'updatetime': opts.updatetime,
'writedescription': opts.writedescription, 'writedescription': opts.writedescription,
'writeinfojson': opts.writeinfojson, 'writeinfojson': opts.writeinfojson,