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

[WIP] remove givencfgs from result

Browse Source
This commit is contained in:
zolliker
2023-10-17 13:06:55 +02:00
parent ee56a23d0b
commit 91dde94e24
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
devices.py
View File

@ -156,13 +156,13 @@ class FrappyConfig(Device):
while True:
# we do not wait for ever here, because there might be changes
# on an unconnected service
self._trigger_change.wait(60)
self._trigger_change.wait(15)
self._trigger_change.clear()
while self._trigger_change.wait(2): # triggered again within 2 sec
self._trigger_change.clear()
try:
cfgs = self.check_services()
proposed, state, info = self.to_consider(cfgs)
proposed, state, remarks = self.to_consider(cfgs)
if state != self._previous_shown and (proposed or not self._servers_loaded):
cmd = 'frappy.has_changed() # inserted automatically when frappy or sea servers changed'
controller.new_request(ScriptRequest(cmd, None, User('guest', USER)))
@ -174,11 +174,11 @@ class FrappyConfig(Device):
for a potential "please consider calling frappy(...)" message
"""
error, proposed, state, info = FrappyManager().get_server_state(config.instrument, cfgs)
error, proposed, state, remarks = FrappyManager().get_server_state(config.instrument, cfgs)
for service, guess in list(proposed.items()):
if guess is True:
proposed.pop(service)
return proposed, state, info
return proposed, state, remarks
def check_services(self):
cfgs = {}
@ -308,21 +308,16 @@ class FrappyConfig(Device):
raise TypeError('refuse to override plugged device')
self.show_config(self.start_services(main, stick, addons))
def show_config(self, allcfg, show_server_state=False, giventitle='nicos'):
proposed, state, info = self.to_consider(allcfg)
def show_config(self, allcfg, show_server_state=False):
proposed, state, remarks = self.to_consider(allcfg)
if show_server_state == 'auto':
show_server_state = state != self._previous_shown
if show_server_state:
givencfgs, remarks = info
frappycfgs, seacfgs = state
# rows = [['', giventitle, 'frappy', 'sea', '']]
rows = [['server', 'frappy', 'sea', '']]
for key, remark in remarks.items():
rows.append([key if key in ('main', 'stick') else 'addons',
frappycfgs.get(key, ''), seacfgs.get(key, ''), remark])
# rows.append([key if key in ('main', 'stick') else 'addon',
# givencfgs.get(key, ''), frappycfgs.get(key, ''),
# seacfgs.get(key, ''), remark])
wid = [max(len(v) for v in column) for column in zip(*rows)]
# insert title underlines
rows.insert(1, ['-' * w for w in wid[:-1]] + [''])
@ -373,7 +368,7 @@ class FrappyConfig(Device):
cfgs['stick'] = running_stick
else:
cfgs.pop('stick', None)
error, proposed, state, info = fm.get_server_state(config.instrument, cfgs)
error, proposed, state, remarks = fm.get_server_state(config.instrument, cfgs)
self._initial_config = proposed
if not error:
self._previous_shown = state # otherwise the server state will be shown on startup