RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change how settings are overriden in ScrapyCommands

This commit is contained in:
Julia Medina 2014-06-03 04:21:17 -03:00
parent 080a28f3e9
commit c81b087de1
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scrapy/command.py
View File

@ -103,20 +103,21 @@ class ScrapyCommand(object):
def process_options(self, args, opts):
try:
self.settings.overrides.update(arglist_to_dict(opts.set))
self.settings.setdict(arglist_to_dict(opts.set),
priority='cmdline')
except ValueError:
raise UsageError("Invalid -s value, use -s NAME=VALUE", print_help=False)
if opts.logfile:
self.settings.overrides['LOG_ENABLED'] = True
self.settings.overrides['LOG_FILE'] = opts.logfile
self.settings.set('LOG_ENABLED', True, priority='cmdline')
self.settings.set('LOG_FILE', opts.logfile, priority='cmdline')
if opts.loglevel:
self.settings.overrides['LOG_ENABLED'] = True
self.settings.overrides['LOG_LEVEL'] = opts.loglevel
self.settings.set('LOG_ENABLED', True, priority='cmdline')
self.settings.set('LOG_LEVEL', opts.loglevel, priority='cmdline')
if opts.nolog:
self.settings.overrides['LOG_ENABLED'] = False
self.settings.set('LOG_ENABLED', False, priority='cmdline')
if opts.pidfile:
with open(opts.pidfile, "w") as f:

6
scrapy/commands/crawl.py
View File

@ -31,9 +31,9 @@ class Command(ScrapyCommand):
raise UsageError("Invalid -a value, use -a NAME=VALUE", print_help=False)
if opts.output:
if opts.output == '-':
self.settings.overrides['FEED_URI'] = 'stdout:'
self.settings.set('FEED_URI', 'stdout:', priority='cmdline')
else:
self.settings.overrides['FEED_URI'] = opts.output
self.settings.set('FEED_URI', opts.output, priority='cmdline')
valid_output_formats = self.settings['FEED_EXPORTERS'].keys() + self.settings['FEED_EXPORTERS_BASE'].keys()
if not opts.output_format:
opts.output_format = os.path.splitext(opts.output)[1].replace(".", "")
@ -42,7 +42,7 @@ class Command(ScrapyCommand):
" using the '-t' switch or as a file extension"
" from the supported list %s" % (opts.output_format,
tuple(valid_output_formats)))
self.settings.overrides['FEED_FORMAT'] = opts.output_format
self.settings.set('FEED_FORMAT', opts.output_format, priority='cmdline')
def run(self, args, opts):
if len(args) < 1:

6
scrapy/commands/runspider.py
View File

@ -54,9 +54,9 @@ class Command(ScrapyCommand):
raise UsageError("Invalid -a value, use -a NAME=VALUE", print_help=False)
if opts.output:
if opts.output == '-':
self.settings.overrides['FEED_URI'] = 'stdout:'
self.settings.set('FEED_URI', 'stdout:', priority='cmdline')
else:
self.settings.overrides['FEED_URI'] = opts.output
self.settings.set('FEED_URI', opts.output, priority='cmdline')
valid_output_formats = self.settings['FEED_EXPORTERS'].keys() + self.settings['FEED_EXPORTERS_BASE'].keys()
if not opts.output_format:
opts.output_format = os.path.splitext(opts.output)[1].replace(".", "")
@ -65,7 +65,7 @@ class Command(ScrapyCommand):
" using the '-t' switch or as a file extension"
" from the supported list %s" % (opts.output_format,
tuple(valid_output_formats)))
self.settings.overrides['FEED_FORMAT'] = opts.output_format
self.settings.set('FEED_FORMAT', opts.output_format, priority='cmdline')
def run(self, args, opts):
if len(args) != 1: