X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=lib%2Fsimple_config.py;h=b4455bb0c0cfe7ecd2720afb1d4a83902cb33d02;hb=5eeae69425b8b12381309c88c20f3508d628557f;hp=31e9571cf82762a38d552beb11a15256cdf6fc88;hpb=c4955ebddda1924eba994d0256ebf7737826004a;p=electrum-nvc.git diff --git a/lib/simple_config.py b/lib/simple_config.py index 31e9571..b4455bb 100644 --- a/lib/simple_config.py +++ b/lib/simple_config.py @@ -1,212 +1,174 @@ -import json, ast -import os, ast -from util import user_dir, print_error +import ast +import threading +import os -from version import ELECTRUM_VERSION, SEED_VERSION +from util import user_dir, print_error, print_msg +SYSTEM_CONFIG_PATH = "/etc/electrum.conf" +config = None -class SimpleConfig: -""" -The SimpleConfig class is responsible for handling operations involving -configuration files. The constructor reads and stores the system and -user configurations from electrum.conf into seperate dictionaries within -a SimpleConfig instance then reads the wallet file. +def get_config(): + global config + return config -""" - def __init__(self, options={}): - # system conf, readonly - self.system_config = {} - self.read_system_config() +def set_config(c): + global config + config = c - # user conf, writeable - self.user_dir = user_dir() - self.user_config = {} - self.read_user_config() - # command-line options - self.options_config = options +class SimpleConfig(object): + """ + The SimpleConfig class is responsible for handling operations involving + configuration files. - self.wallet_config = {} - self.wallet_file_exists = False - self.init_path(self.options_config.get('wallet_path')) - print_error( "path", self.path ) - if self.path: - self.read_wallet_config(self.path) - - - - + There are 3 different sources of possible configuration values: + 1. Command line options. + 2. User configuration (in the user's config directory) + 3. System configuration (in /etc/) + They are taken in order (1. overrides config options set in 2., that + override config set in 3.) + """ + def __init__(self, options=None, read_system_config_function=None, + read_user_config_function=None, read_user_dir_function=None): - def set_key(self, key, value, save = False): - # find where a setting comes from and save it there - if self.options_config.get(key) is not None: - print "Warning: not changing '%s' because it was passed as a command-line option"%key - return - - elif self.user_config.get(key) is not None: - self.user_config[key] = value - if save: self.save_user_config() + # This is the holder of actual options for the current user. + self.current_options = {} + # This lock needs to be acquired for updating and reading the config in + # a thread-safe way. + self.lock = threading.RLock() + # The path for the config directory. This is set later by init_path() + self.path = None - elif self.system_config.get(key) is not None: - if str(self.system_config[key]) != str(value): - print "Warning: not changing '%s' because it was set in the system configuration"%key - - elif self.wallet_config.get(key) is not None: - self.wallet_config[key] = value - if save: self.save_wallet_config() + if options is None: + options = {} # Having a mutable as a default value is a bad idea. + # The following two functions are there for dependency injection when + # testing. + if read_system_config_function is None: + read_system_config_function = read_system_config + if read_user_config_function is None: + read_user_config_function = read_user_config + if read_user_dir_function is None: + self.user_dir = user_dir else: - # add key to wallet config - self.wallet_config[key] = value - if save: self.save_wallet_config() + self.user_dir = read_user_dir_function + # Save the command-line keys to make sure we don't override them. + self.command_line_keys = options.keys() + # Save the system config keys to make sure we don't override them. + self.system_config_keys = [] - def get(self, key, default=None): - """Retrieve the filepath of the configuration file specified in the 'key' parameter.""" - # 1. command-line options always override everything - if self.options_config.has_key(key) and self.options_config.get(key) is not None: - out = self.options_config.get(key) + if options.get('portable') is not True: + # system conf + system_config = read_system_config_function() + self.system_config_keys = system_config.keys() + self.current_options.update(system_config) - # 2. user configuration - elif self.user_config.has_key(key): - out = self.user_config.get(key) + # update the current options with the command line options last (to + # override both others). + self.current_options.update(options) - # 2. system configuration - elif self.system_config.has_key(key): - out = self.system_config.get(key) + # init path + self.init_path() - # 3. use the wallet file config - else: - out = self.wallet_config.get(key) + # user config. + self.user_config = read_user_config_function(self.path) + # The user config is overwritten by the current config! + self.user_config.update(self.current_options) + self.current_options = self.user_config - if out is None and default is not None: - out = default + set_config(self) # Make a singleton instance of 'self' - # try to fix the type - if default is not None and type(out) != type(default): - import ast - try: - out = ast.literal_eval(out) - except TypeError: - print "type error, using default value" - out = default + def init_path(self): + # Read electrum path in the command line configuration + self.path = self.current_options.get('electrum_path') - return out + # If not set, use the user's default data directory. + if self.path is None: + self.path = self.user_dir() + # Make directory if it does not yet exist. + if not os.path.exists(self.path): + os.mkdir(self.path) - def is_modifiable(self, key): - if self.options_config.has_key(key): - return False - elif self.user_config.has_key(key): - return True - elif self.system_config.has_key(key): - return False - else: - return True - - - def read_system_config(self): - """Parse and store the system config settings in electrum.conf into system_config[].""" - name = '/etc/electrum.conf' - if os.path.exists(name): - try: - import ConfigParser - except ImportError: - print "cannot parse electrum.conf. please install ConfigParser" - return - - p = ConfigParser.ConfigParser() - p.read(name) - try: - for k, v in p.items('client'): - self.system_config[k] = v - except ConfigParser.NoSectionError: - pass - - - def read_user_config(self): - """Parse and store the user config settings in electrum.conf into user_config[].""" - if not self.user_dir: return - - name = os.path.join( self.user_dir, 'electrum.conf') - if os.path.exists(name): - try: - import ConfigParser - except ImportError: - print "cannot parse electrum.conf. please install ConfigParser" - return - - p = ConfigParser.ConfigParser() - p.read(name) - try: - for k, v in p.items('client'): - self.user_config[k] = v - except ConfigParser.NoSectionError: - pass - - - def init_path(self, path): - """Set the path of the wallet.""" - - if not path: - path = self.get('default_wallet_path') - - if path is not None: - self.path = path + print_error( "electrum directory", self.path) + + def set_key(self, key, value, save = True): + if not self.is_modifiable(key): + print "Warning: not changing key '%s' because it is not modifiable" \ + " (passed as command line option or defined in /etc/electrum.conf)"%key return - # Look for wallet file in the default data directory. - # Make wallet directory if it does not yet exist. - if not os.path.exists(self.user_dir): - os.mkdir(self.user_dir) - self.path = os.path.join(self.user_dir, "electrum.dat") + with self.lock: + self.user_config[key] = value + self.current_options[key] = value + if save: + self.save_user_config() + return - def save_user_config(self): - if not self.user_dir: return + def get(self, key, default=None): + out = None + with self.lock: + out = self.current_options.get(key, default) + return out - import ConfigParser - config = ConfigParser.RawConfigParser() - config.add_section('client') - for k,v in self.user_config.items(): - config.set('client', k, v) + def is_modifiable(self, key): + if key in self.command_line_keys: + return False + if key in self.system_config_keys: + return False + return True - with open( os.path.join( self.user_dir, 'electrum.conf'), 'wb') as configfile: - config.write(configfile) - + def save_user_config(self): + if not self.path: return + path = os.path.join(self.path, "config") + s = repr(self.user_config) + f = open(path,"w") + f.write( s ) + f.close() + if self.get('gui') != 'android': + import stat + os.chmod(path, stat.S_IREAD | stat.S_IWRITE) +def read_system_config(): + """Parse and return the system config settings in /etc/electrum.conf.""" + if os.path.exists(SYSTEM_CONFIG_PATH): + try: + import ConfigParser + except ImportError: + print "cannot parse electrum.conf. please install ConfigParser" + return - def read_wallet_config(self, path): - """Read the contents of the wallet file.""" + p = ConfigParser.ConfigParser() + p.read(SYSTEM_CONFIG_PATH) + result = {} + try: + for k, v in p.items('client'): + result[k] = v + except ConfigParser.NoSectionError: + pass + return result + +def read_user_config(path): + """Parse and store the user config settings in electrum.conf into user_config[].""" + if not path: return + + config_path = os.path.join(path, "config") + if os.path.exists(config_path): try: - with open(self.path, "r") as f: + with open(config_path, "r") as f: data = f.read() except IOError: return try: d = ast.literal_eval( data ) #parse raw data from reading wallet file - except: - raise IOError("Cannot read wallet file.") - - self.wallet_config = d - self.wallet_file_exists = True - - - - def save(self): - self.save_wallet_config() - - - def save_wallet_config(self): - s = repr(self.wallet_config) - f = open(self.path,"w") - f.write( s ) - f.close() - if self.get('gui') != 'android': - import stat - os.chmod(self.path,stat.S_IREAD | stat.S_IWRITE) + except Exception: + print_msg("Error: Cannot read config file.") + return + return d