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

add proposed into state

Browse Source
This commit is contained in:
zolliker
2023-10-17 14:37:19 +02:00
parent 062341ab8a
commit 7b08743a3f
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
devices.py
View File

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