linse/frappy_sinq
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] fix old .guess_cfg method

Browse Source
This commit is contained in:
zolliker
2023-10-16 11:29:35 +02:00
parent 0f1538c156
commit fedfe3a278
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
devices.py
View File

@ -162,8 +162,8 @@ class FrappyConfig(Device):
self._trigger_change.clear() self._trigger_change.clear()
try: try:
cfgs = self.check_services() cfgs = self.check_services()
guess_info = self.to_consider(cfgs) proposed, overview = self.to_consider(cfgs)
if (cfgs, guess_info) != self._previous_shown and (guess_info or not self._servers_loaded): if (cfgs, proposed) != self._previous_shown and (proposed or not self._servers_loaded):
cmd = 'frappy_changed()' cmd = 'frappy_changed()'
controller.new_request(ScriptRequest(cmd, None, User('guest', USER))) controller.new_request(ScriptRequest(cmd, None, User('guest', USER)))
except RequestError as e: except RequestError as e:
@ -174,16 +174,11 @@ class FrappyConfig(Device):
for a potential "please consider calling frappy(...)" message for a potential "please consider calling frappy(...)" message
""" """
guess_info = {} proposed, overview = FrappyManager().propose_cfgs(config.instrument, cfgs)
for service, guess in FrappyManager().guess_cfgs(config.instrument, cfgs).items(): for service, guess in list(proposed.items()):
proposed = guess.get('proposed') if guess is True:
if proposed: proposed.pop(service)
guess_info[service] = proposed return proposed, overview
else:
missing = guess.get('missing')
if missing:
guess_info[service] = [m + '?' for m in missing]
return guess_info
def check_services(self): def check_services(self):
cfgs = {} cfgs = {}
@ -314,15 +309,15 @@ class FrappyConfig(Device):
self.show_config(self.start_services(main, stick, addons)) self.show_config(self.start_services(main, stick, addons))
def show_config(self, allcfg): def show_config(self, allcfg):
guess_info = self.to_consider(allcfg) proposed, overview = self.to_consider(allcfg)
# remove 'frappy_changed()' commands in script queue # remove 'frappy_changed()' commands in script queue
controller = session.daemon_device._controller controller = session.daemon_device._controller
controller.block_requests(r['reqid'] for r in controller.get_queue() if r['script'] == 'frappy_changed()') controller.block_requests(r['reqid'] for r in controller.get_queue() if r['script'] == 'frappy_changed()')
self._previous_shown = allcfg, guess_info self._previous_shown = allcfg, overview
session.log.info(all_info(allcfg)) session.log.info(all_info(allcfg))
if guess_info: if proposed:
info = all_info(guess_info, '') info = all_info(proposed, '')
session.log.warning('please consider to call:') session.log.warning('please consider to call:')
session.log.info(info) session.log.info(info)
if '?' in info: if '?' in info: