From d71469c10f1066cbb6935303dd8a7e23c2802fb1 Mon Sep 17 00:00:00 2001 From: James Muscat Date: Tue, 14 Apr 2015 00:55:31 +0100 Subject: [PATCH] This is slightly horrid, but parse the commandline in Settings to determine if we need to override our configuration. --- src/eddn/conf/Settings.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/eddn/conf/Settings.py b/src/eddn/conf/Settings.py index 6c3b620..bb168ab 100644 --- a/src/eddn/conf/Settings.py +++ b/src/eddn/conf/Settings.py @@ -5,6 +5,7 @@ Created on 15 Nov 2014 ''' import simplejson +import argparse from eddn import __version__ as version @@ -38,8 +39,17 @@ class _Settings(object): def loadFrom(self, fileName): f = open(fileName, 'r') conf = simplejson.load(f) - for key, value in conf: + for key, value in conf.iteritems(): if key in self.__dict__: self.__dict__[key] = value + else: + print "Ignoring unknown setting {0}".format(key) Settings = _Settings() + +parser = argparse.ArgumentParser() +parser.add_argument("-c", "--config", nargs="?", default=None) +args = parser.parse_args() + +if args.config: + Settings.loadFrom(args.config)