converted --user-agent and --referer to docopts mode

This commit is contained in:
SavinaRoja 2013-10-05 21:00:48 -04:00
parent 93d739c7dd
commit 79ed9e9bac

View File

@ -338,10 +338,10 @@ def parseOpts(overrideArguments=None):
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',
dest='referer', help='specify a custom referer, use if the video access is restricted to one domain', # dest='referer', help='specify a custom referer, use if the video access is restricted to one domain',
metavar='REF', default=None) metavar='REF', default=None)
general.add_option('--list-extractors', general.add_option('--list-extractors',
action='store_true', dest='list_extractors', action='store_true', dest='list_extractors',
@ -581,12 +581,12 @@ def _real_main(argv=None):
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)
# Set user agent # Set user agent
if opts.user_agent is not None: if opts['--user-agent']:
std_headers['User-Agent'] = opts.user_agent std_headers['User-Agent'] = opts['--user-agent']
# Set referer # Set referer
if opts.referer is not None: if opts['--referer']:
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: