started configuration persistence implementation

lib/solaar/configuration.py

@@ -0,0 +1,144 @@
+#
+#
+#
+
+import os as _os
+import os.path as _path
+from json import load as _json_load, dump as _json_save
+
+from logging import getLogger, DEBUG as _DEBUG
+_log = getLogger('solaar.configuration')
+del getLogger
+
+_XDG_CONFIG_HOME = _os.environ.get('XDG_CONFIG_HOME') or _path.join(_path.expanduser('~'), '.config')
+_file_path = _path.join(_path.join(_XDG_CONFIG_HOME, 'solaar'), 'config.json')
+
+
+from solaar import __version__
+_configuration = { '_version': __version__ }
+
+
+def _load():
+	if _path.isfile(_file_path):
+		loaded_configuration = {}
+		try:
+			with open(_file_path, 'r') as config_file:
+				loaded_configuration = _json_load(config_file)
+		except:
+			_log.error("failed to load from %s", _file_path)
+
+		# loaded_configuration.update(_configuration)
+		_configuration.clear()
+		_configuration.update(loaded_configuration)
+
+	if _log.isEnabledFor(_DEBUG):
+		_log.debug("load => %s", _configuration)
+
+	_configuration['_version'] = __version__
+	return _configuration
+
+
+def save():
+	dirname = _os.path.dirname(_file_path)
+	if not _path.isdir(dirname):
+		try:
+			_os.makedirs(dirname)
+		except:
+			_log.error("failed to create %s", dirname)
+			return False
+
+	try:
+		with open(_file_path, 'w') as config_file:
+			_json_save(_configuration, config_file, skipkeys=True, indent=2, sort_keys=True)
+
+		_log.info("saved %s to %s", _configuration, _file_path)
+		return True
+	except:
+		_log.error("failed to save to %s", _file_path)
+
+
+def all():
+	if not _configuration:
+		_load()
+
+	return dict(_configuration)
+
+
+def _device_key(device):
+	return '%s:%s' % (device.serial, device.kind)
+
+def _device_entry(device):
+	if not _configuration:
+		_load()
+
+	device_key = _device_key(device)
+	if device_key in _configuration:
+		c = _configuration[device_key]
+	else:
+		c = _configuration[device_key] = {}
+
+	c['_name'] = device.name
+	return c
+
+
+def set(key, value):
+	set(None, key, value)
+
+
+def get(key, default_value=None):
+	return
+
+
+def set_device(device, key, value):
+	_device_entry(device)[key] = value
+
+
+def get_device(device, key, default_value=None):
+	return _device_entry(device).get(key, default_value)
+
+
+def apply_to(device):
+	if not _configuration:
+		_load()
+
+	if _log.isEnabledFor(_DEBUG):
+		_log.debug("applying to %s", device)
+
+	entry = _device_entry(device)
+	for s in device.settings:
+		value = s.read()
+		if s.name in entry:
+			if value is None:
+				del entry[s.name]
+			elif value != entry[s.name]:
+				s.write(entry[s.name])
+		else:
+			entry[s.name] = value
+
+
+def acquire_from(device):
+	if not _configuration:
+		_load()
+
+	if _log.isEnabledFor(_DEBUG):
+		_log.debug("acquiring from %s", device)
+
+	entry = _device_entry(device)
+	for s in device.settings:
+		value = s.read()
+		if value is not None:
+			entry[s.name] = value
+
+	save()
+
+
+def forget(device):
+	if not _configuration:
+		_load()
+
+	if _log.isEnabledFor(_DEBUG):
+		_log.debug("forgetting %s", device)
+
+	device_key = _device_key(device)
+	if device_key in _configuration:
+		del _configuration[device_key]

lib/solaar/listener.py

@@ -8,6 +8,7 @@ from logging import getLogger, DEBUG as _DEBUG
 _log = getLogger('solaar.listener')
 del getLogger
 
+from . import configuration
 from logitech.unifying_receiver import (Receiver,
 										listener as _listener,
 										status as _status)
@@ -71,6 +72,8 @@ class ReceiverListener(_listener.EventsListener):
 					_log.exception("closing receiver %s" % r.path)
 		self.status_changed_callback(r)  #, _status.ALERT.NOTIFICATION)
 
+		# configuration.save()
+
 	def tick(self, timestamp):
 		# if _log.isEnabledFor(_DEBUG):
 		# 	_log.debug("%s: polling status: %s", self.receiver, list(iter(self.receiver)))
@@ -108,7 +111,8 @@ class ReceiverListener(_listener.EventsListener):
 			self.status_changed_callback(device, alert, reason)
 		else:
 			if device.status is None:
-				# the device may be paired later, possibly to another receiver?
+				# device was just un-paired
+				# it may be paired later, possibly to another receiver?
 				# so maybe we shouldn't forget about it
 				# configuration.forget(device)
 
@@ -117,12 +121,15 @@ class ReceiverListener(_listener.EventsListener):
 				device = _ghost(device)
 
 			# elif device.status:
-			# 	configuration.sync(device)
+			# 	configuration.apply_to(device)
+			# 	configuration.acquire_from(device)
+
 
 			self.status_changed_callback(device, alert, reason)
 
 			if device.status is None:
-				# the receiver changed status as well
+				# the device was just unpaired, need to update the
+				# status of the receiver as well
 				self.status_changed_callback(self.receiver)
 
 	def _notifications_handler(self, n):