[WIP] fix old .guess_cfg method
This commit is contained in:
27
devices.py
27
devices.py
@ -162,8 +162,8 @@ class FrappyConfig(Device):
|
||||
self._trigger_change.clear()
|
||||
try:
|
||||
cfgs = self.check_services()
|
||||
guess_info = self.to_consider(cfgs)
|
||||
if (cfgs, guess_info) != self._previous_shown and (guess_info or not self._servers_loaded):
|
||||
proposed, overview = self.to_consider(cfgs)
|
||||
if (cfgs, proposed) != self._previous_shown and (proposed or not self._servers_loaded):
|
||||
cmd = 'frappy_changed()'
|
||||
controller.new_request(ScriptRequest(cmd, None, User('guest', USER)))
|
||||
except RequestError as e:
|
||||
@ -174,16 +174,11 @@ class FrappyConfig(Device):
|
||||
|
||||
for a potential "please consider calling frappy(...)" message
|
||||
"""
|
||||
guess_info = {}
|
||||
for service, guess in FrappyManager().guess_cfgs(config.instrument, cfgs).items():
|
||||
proposed = guess.get('proposed')
|
||||
if proposed:
|
||||
guess_info[service] = proposed
|
||||
else:
|
||||
missing = guess.get('missing')
|
||||
if missing:
|
||||
guess_info[service] = [m + '?' for m in missing]
|
||||
return guess_info
|
||||
proposed, overview = FrappyManager().propose_cfgs(config.instrument, cfgs)
|
||||
for service, guess in list(proposed.items()):
|
||||
if guess is True:
|
||||
proposed.pop(service)
|
||||
return proposed, overview
|
||||
|
||||
def check_services(self):
|
||||
cfgs = {}
|
||||
@ -314,15 +309,15 @@ class FrappyConfig(Device):
|
||||
self.show_config(self.start_services(main, stick, addons))
|
||||
|
||||
def show_config(self, allcfg):
|
||||
guess_info = self.to_consider(allcfg)
|
||||
proposed, overview = self.to_consider(allcfg)
|
||||
# remove 'frappy_changed()' commands in script queue
|
||||
controller = session.daemon_device._controller
|
||||
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))
|
||||
|
||||
if guess_info:
|
||||
info = all_info(guess_info, '')
|
||||
if proposed:
|
||||
info = all_info(proposed, '')
|
||||
session.log.warning('please consider to call:')
|
||||
session.log.info(info)
|
||||
if '?' in info:
|
||||
|
Reference in New Issue
Block a user