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

converting opts.cookiefile to opts[--cookies]

Browse Source
This commit is contained in:
SavinaRoja 2013-10-05 20:55:40 -04:00
parent 90f577f4e9
commit 93d739c7dd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/__init__.py
View File

@ -492,8 +492,8 @@ def parseOpts(overrideArguments=None):
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',
@ -568,12 +568,12 @@ def _real_main(argv=None):
#parser, opts, args = parseOpts(argv) #parser, opts, args = parseOpts(argv)
# Open appropriate CookieJar # Open appropriate CookieJar
if opts.cookiefile is None: if not opts['--cookies']:
jar = compat_cookiejar.CookieJar() jar = compat_cookiejar.CookieJar()
else: else:
try: try:
jar = compat_cookiejar.MozillaCookieJar(opts.cookiefile) jar = compat_cookiejar.MozillaCookieJar(opts['--cookies'])
if os.access(opts.cookiefile, 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:
@ -838,7 +838,7 @@ def _real_main(argv=None):
retcode = 101 retcode = 101
# Dump cookie jar if requested # Dump cookie jar if requested
if opts.cookiefile is not None: if opts['--cookies']:
try: try:
jar.save() jar.save()
except (IOError, OSError) as err: except (IOError, OSError) as err: