Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow dynamic configs to specify defaults centrally

Browse Source
This commit is contained in:
Kovid Goyal 2010-08-22 14:55:49 -06:00
parent a97cffc1e9
commit c2364a6b87
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/calibre/utils/config.py
View File

@ -496,6 +496,7 @@ class DynamicConfig(dict):
def __init__(self, name='dynamic'): def __init__(self, name='dynamic'):
dict.__init__(self, {}) dict.__init__(self, {})
self.name = name self.name = name
self.defaults = {}
self.file_path = os.path.join(config_dir, name+'.pickle') self.file_path = os.path.join(config_dir, name+'.pickle')
self.refresh() self.refresh()
@ -520,7 +521,13 @@ class DynamicConfig(dict):
try: try:
return dict.__getitem__(self, key) return dict.__getitem__(self, key)
except KeyError: except KeyError:
return None return self.defaults.get(key, None)
def get(self, key, default=None):
try:
return dict.__getitem__(self, key)
except KeyError:
return self.defaults.get(key, default)
def __setitem__(self, key, val): def __setitem__(self, key, val):
dict.__setitem__(self, key, val) dict.__setitem__(self, key, val)
@ -555,6 +562,7 @@ class XMLConfig(dict):
def __init__(self, rel_path_to_cf_file): def __init__(self, rel_path_to_cf_file):
dict.__init__(self) dict.__init__(self)
self.defaults = {}
self.file_path = os.path.join(config_dir, self.file_path = os.path.join(config_dir,
*(rel_path_to_cf_file.split('/'))) *(rel_path_to_cf_file.split('/')))
self.file_path = os.path.abspath(self.file_path) self.file_path = os.path.abspath(self.file_path)
@ -592,7 +600,16 @@ class XMLConfig(dict):
ans = ans.data ans = ans.data
return ans return ans
except KeyError: except KeyError:
return None return self.defaults.get(key, None)
def get(self, key, default=None):
try:
ans = dict.__getitem__(self, key)
if isinstance(ans, plistlib.Data):
ans = ans.data
return ans
except KeyError:
return self.defaults.get(key, default)
def __setitem__(self, key, val): def __setitem__(self, key, val):
if isinstance(val, (bytes, str)): if isinstance(val, (bytes, str)):
@ -648,7 +665,16 @@ class JSONConfig(XMLConfig):
return json.dumps(self, indent=2, default=to_json) return json.dumps(self, indent=2, default=to_json)
def __getitem__(self, key): def __getitem__(self, key):
return dict.__getitem__(self, key) try:
return dict.__getitem__(self, key)
except KeyError:
return self.defaults[key]
def get(self, key, default=None):
try:
return dict.__getitem__(self, key)
except KeyError:
return self.defaults.get(key, default)
def __setitem__(self, key, val): def __setitem__(self, key, val):
dict.__setitem__(self, key, val) dict.__setitem__(self, key, val)