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

cli: explicitly save configuration at end of solaar config if no GUI running

This commit is contained in:
Peter F. Patel-Schneider 2022-07-17 06:34:15 -04:00
parent e51b98e1fe
commit c8f3baf261
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/solaar/cli/config.py
View File

@ -194,18 +194,22 @@ def run(receivers, args, find_receiver, find_device):
application.register() application.register()
remote = application.get_is_remote() remote = application.get_is_remote()
# if the Solaar UI is running don't save configuration here # don't save configuration here because we might want the Solaar GUI to make the change
result, message, value = set(dev, setting, args, not remote) result, message, value = set(dev, setting, args, False)
if message is not None: if message is not None:
print(message) print(message)
if result is None: if result is None:
raise Exception("%s: failed to set value '%s' [%r]" % (setting.name, str(value), value)) raise Exception("%s: failed to set value '%s' [%r]" % (setting.name, str(value), value))
# if the Solaar UI is running tell it to also perform the set # if the Solaar UI is running tell it to also perform the set, otherwise save the change in the configuration file
if remote: if remote:
argl = ['config', dev.serial or dev.unitId, setting.name] argl = ['config', dev.serial or dev.unitId, setting.name]
argl.extend([a for a in [args.value_key, args.extra_subkey, args.extra2] if a is not None]) argl.extend([a for a in [args.value_key, args.extra_subkey, args.extra2] if a is not None])
application.run(_yaml.safe_dump(argl)) application.run(_yaml.safe_dump(argl))
else:
if dev.persister and setting.persist:
dev.persister[setting.name] = setting._value
_configuration.save(defer=False)
def set(dev, setting, args, save): def set(dev, setting, args, save):