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

try to avoid 'None' as target

Browse Source 
use '-' instead
This commit is contained in:
zolliker
2024-06-25 12:48:26 +02:00
parent c237718a2d
commit 1fd0647d74
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devices.py
View File

@ -237,7 +237,7 @@ class FrappyConfig(Device):
if cfg == '': if cfg == '':
changes.pop(service) changes.pop(service)
cfg = None cfg = None
if target_cfgs.get(service): if target_cfgs.get(service, '-') not in ('', '-'):
need_change = 1 need_change = 1
if cfg and not isinstance(cfg, Keep): if cfg and not isinstance(cfg, Keep):
need_change = cfg need_change = cfg
@ -256,7 +256,7 @@ class FrappyConfig(Device):
secnode = session.devices.get(secnodename) secnode = session.devices.get(secnodename)
if secnode: if secnode:
cfgs[secnode.service] = secnode.get_info() cfgs[secnode.service] = secnode.get_info()
targets[secnode.service] = None if secnode.target == 'None' else secnode.target targets[secnode.service] = secnode.target
self._current_cfgs = cfgs self._current_cfgs = cfgs
self._target_cfgs = targets self._target_cfgs = targets
return cfgs, targets return cfgs, targets
@ -463,7 +463,7 @@ class FrappyConfig(Device):
cfg = cache.get(secnode, 'previous_config', '') cfg = cache.get(secnode, 'previous_config', '')
if cfg: if cfg:
cfgs[serv] = cfg cfgs[serv] = cfg
self._initial_info = {s: (cfgs.get(s), running.get(s)) for s in fm.services} self._initial_info = {s: (cfgs.get(s, '-'), running.get(s)) for s in fm.services}
fm.get_server_state(config.instrument, cfgs) fm.get_server_state(config.instrument, cfgs)
return self._initial_info[service] return self._initial_info[service]
@ -676,7 +676,7 @@ class FrappyNode(SecNodeDevice, Moveable):
__log_recording = () __log_recording = ()
def doStart(self, value): def doStart(self, value):
if value == 'None': if value in ('-', 'None'):
value = None value = None
self.restart(value) self.restart(value)
@ -834,7 +834,7 @@ class FrappyNode(SecNodeDevice, Moveable):
def get_info(self): def get_info(self):
result = self.doRead() or '' result = self.doRead() or ''
code, text = self.status() code, text = self.status()
if not result and self.target: if not result and self.target not in ('', '-'):
return '<disconnected>' return '<disconnected>'
if code == status.OK or result == '': if code == status.OK or result == '':
return result return result