[WIP] frappy_changed() -> frappy.changed()

commands.py

@@ -72,10 +72,3 @@ def frappy_list(service=None):
 
     FrappyManager().do_listcfg(config.instrument, service or 'main', prt)
     session.log.info('\n%s', '\n'.join(content))
-
-
-@usercommand
-def frappy_changed():
-    fc = get_frappy_config()
-    if fc:
-        fc.changed()

devices.py

@@ -163,8 +163,9 @@ class FrappyConfig(Device):
             try:
                 cfgs = self.check_services()
                 proposed, overview = self.to_consider(cfgs)
+                proposed = {k: cfgs.get(k) if v is True else v for k, v in proposed.items()}
                 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)))
             except RequestError as e:
                 session.log.error(f'can not queue request {e!r}')
@@ -310,9 +311,9 @@ class FrappyConfig(Device):
 
     def show_config(self, allcfg, full=False):
         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.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, overview
         session.log.info(all_info(allcfg))