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

configuration: fix glitch when changing versions

This commit is contained in:
Peter F. Patel-Schneider 2023-01-12 09:59:23 -05:00
parent 6cbd45a1c0
commit ff24947321
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/solaar/configuration.py
View File

@ -84,11 +84,12 @@ def _parse_config(loaded_config, config_path):
loaded_version = loaded_config[0] loaded_version = loaded_config[0]
discard_derived_properties = loaded_version != current_version discard_derived_properties = loaded_version != current_version
if discard_derived_properties: if discard_derived_properties:
_log.warning( if _log.isEnabledFor(_INFO):
'config file \'%s\' was generated by another version of solaar ' _log.info(
'(config: %s, current: %s). refreshing detected device capabilities', config_path, loaded_version, 'config file \'%s\' was generated by another version of solaar '
current_version '(config: %s, current: %s). refreshing detected device capabilities', config_path, loaded_version,
) current_version
)
for device in loaded_config[1:]: for device in loaded_config[1:]:
assert isinstance(device, dict) assert isinstance(device, dict)
@ -112,8 +113,8 @@ def _device_entry_from_config_dict(data, discard_derived_properties):
# remove any string entries (from bad conversions) # remove any string entries (from bad conversions)
data['divert-keys'] = {k: v for k, v in divert.items() if isinstance(k, int)} data['divert-keys'] = {k: v for k, v in divert.items() if isinstance(k, int)}
if discard_derived_properties: if discard_derived_properties:
data.pop('_absent') data.pop('_absent', None)
data.pop('_battery') data.pop('_battery', None)
return _DeviceEntry(**data) return _DeviceEntry(**data)