From 91dde94e2428b2c62e8b2253675fefa24b82188c Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 17 Oct 2023 13:06:55 +0200 Subject: [PATCH] [WIP] remove givencfgs from result --- devices.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/devices.py b/devices.py index 8b8cd9f..1afb0bf 100644 --- a/devices.py +++ b/devices.py @@ -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