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

don't save the configuration if it hasn't been loaded first

This commit is contained in:
Daniel Pavel 2013-06-20 14:27:18 +02:00
parent b2f1786eff
commit 92f7e761ee
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/solaar/configuration.py
View File

@ -15,9 +15,12 @@ _file_path = _path.join(_path.join(_XDG_CONFIG_HOME, 'solaar'), 'config.json')
from solaar import __version__ from solaar import __version__
_KEY_VERSION = '_version'
_KEY_NAME = '_name'
_configuration = {} _configuration = {}
def _load(): def _load():
if _path.isfile(_file_path): if _path.isfile(_file_path):
loaded_configuration = {} loaded_configuration = {}
@ -34,11 +37,15 @@ def _load():
if _log.isEnabledFor(_DEBUG): if _log.isEnabledFor(_DEBUG):
_log.debug("load => %s", _configuration) _log.debug("load => %s", _configuration)
_configuration['_version'] = __version__ _configuration[_KEY_VERSION] = __version__
return _configuration return _configuration
def save(): def save():
# don't save if the configuration hasn't been loaded
if _KEY_VERSION not in _configuration:
return
dirname = _os.path.dirname(_file_path) dirname = _os.path.dirname(_file_path)
if not _path.isdir(dirname): if not _path.isdir(dirname):
try: try:
@ -78,7 +85,7 @@ def _device_entry(device):
else: else:
c = _configuration[device_key] = {} c = _configuration[device_key] = {}
c['_name'] = device.name c[_KEY_NAME] = device.name
return c return c