From 7b08743a3ffb1f4916e5c252105b7ccb2bc09972 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Tue, 17 Oct 2023 14:37:19 +0200
Subject: [PATCH] add proposed into state

---
 devices.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/devices.py b/devices.py
index 5c0592b..13e5d42 100644
--- a/devices.py
+++ b/devices.py
@@ -162,8 +162,8 @@ class FrappyConfig(Device):
                 self._trigger_change.clear()
             try:
                 cfgs = self.check_services()
-                proposed, state, remarks = self.to_consider(cfgs)
-                if state != self._previous_shown and (proposed or not self._servers_loaded):
+                changes, state, remarks = self.to_consider(cfgs)
+                if state != self._previous_shown and changes:
                     cmd = 'frappy.has_changed()  # inserted automatically when frappy or sea servers changed'
                     controller.new_request(ScriptRequest(cmd, None, User('guest', USER)))
             except RequestError as e:
@@ -175,16 +175,17 @@ class FrappyConfig(Device):
         for a potential "please consider calling frappy(...)" message
         """
         error, proposed, state, remarks = FrappyManager().get_server_state(config.instrument, cfgs)
-        for service, guess in list(proposed.items()):
+        changes = dict(proposed)
+        for service, guess in proposed.items():
             if guess is True:
-                proposed.pop(service)
+                changes.pop(service)
         disconnected = set()
         for service, info in cfgs.items():
             if info == '<disconnected>':
                 disconnected.add(service)
-                if not proposed.get(service):
-                    proposed[service] = ''
-        return proposed, state + (disconnected,), remarks
+                if not changes.get(service):
+                    changes[service] = ''
+        return changes, (proposed,) + state, remarks
 
     def check_services(self):
         cfgs = {}
@@ -318,7 +319,7 @@ class FrappyConfig(Device):
         self.show_config(self.start_services(main, stick, addons))
 
     def show_config(self, allcfg, show_server_state=False):
-        proposed, state, remarks = self.to_consider(allcfg)
+        changes, state, remarks = self.to_consider(allcfg)
         if show_server_state == 'auto':
             show_server_state = state != self._previous_shown
         if show_server_state:
@@ -342,16 +343,16 @@ class FrappyConfig(Device):
         self._previous_shown = state
         session.log.info(all_info(allcfg))
 
-        if proposed:
-            info = all_info(proposed, 'proposed cfg changes: ')
+        if changes:
+            info = all_info(changes, 'proposed cfg changes: ')
             session.log.info(info)
             session.log.warning('please consider to call: frappy.update() for doing above changes')
             if '?' in info:
                 session.log.warning("but create cfg files first for items marked with '?'")
 
     def update(self):
-        proposed = self.to_consider(self.check_services())[0]
-        self.show_config(self.start_services(**proposed))
+        changes = self.to_consider(self.check_services())[0]
+        self.show_config(self.start_services(**changes))
 
     def initial_restart_cfg(self, service):
         """get cfg for (re)start of the service