frappy-cli: allow to use io(<command>) instead of io.communciate(<command>)
Change-Id: I0b6b0cd432574522a5c45ce0e9d36abd2cef5e70
This commit is contained in:
1 parent
ee19544e79
commit
d43a5fa5a1
1 file changed
+41
-20
@@ -215,6 +215,33 @@ class Module:
|
||||
clientenv.raise_with_short_traceback(error)
|
||||
return value
|
||||
|
||||
def showAll(self):
|
||||
wid = max((len(k) for k in self._parameters), default=0)
|
||||
return '%s\n%s%s' % (
|
||||
self._title,
|
||||
'\n'.join(self._one_line(k, wid) for k in self._parameters),
|
||||
'\nCommands: %s' % ', '.join(k + '()' for k in self._commands) if self._commands else '')
|
||||
|
||||
def log_filter(self, pattern='.*'):
|
||||
self._log_pattern = re.compile(pattern)
|
||||
|
||||
def handle_log_message_(self, loglevel, data):
|
||||
if self._log_pattern.match(data):
|
||||
if loglevel == 'comlog':
|
||||
self._secnode.log.info('%s%s', self._name, data)
|
||||
else:
|
||||
self._secnode.log.info('%s %s: %s', self._name, loglevel, data)
|
||||
|
||||
def __repr__(self):
|
||||
return f'<module {self._name}>'
|
||||
|
||||
|
||||
class Readable(Module):
|
||||
def __call__(self):
|
||||
return self.read()
|
||||
|
||||
|
||||
class Writable(Module):
|
||||
def __call__(self, target=UNDEF):
|
||||
if target is UNDEF:
|
||||
return self.read()
|
||||
@@ -262,25 +289,14 @@ class Module:
|
||||
(self._name, pname), updateEvent=self._watch_parameter)
|
||||
return self.value
|
||||
|
||||
def __repr__(self):
|
||||
return f'<module {self._name}>'
|
||||
|
||||
def showAll(self):
|
||||
wid = max((len(k) for k in self._parameters), default=0)
|
||||
return '%s\n%s%s' % (
|
||||
self._title,
|
||||
'\n'.join(self._one_line(k, wid) for k in self._parameters),
|
||||
'\nCommands: %s' % ', '.join(k + '()' for k in self._commands) if self._commands else '')
|
||||
|
||||
def log_filter(self, pattern='.*'):
|
||||
self._log_pattern = re.compile(pattern)
|
||||
|
||||
def handle_log_message_(self, loglevel, data):
|
||||
if self._log_pattern.match(data):
|
||||
if loglevel == 'comlog':
|
||||
self._secnode.log.info('%s%s', self._name, data)
|
||||
else:
|
||||
self._secnode.log.info('%s %s: %s', self._name, loglevel, data)
|
||||
class Communicator(Module):
|
||||
def __call__(self, command=UNDEF):
|
||||
if command is UNDEF:
|
||||
if 'is_connected' in self._parameters:
|
||||
return f'is_connected={self.is_connected}'
|
||||
return None
|
||||
return self.communicate(command)
|
||||
|
||||
|
||||
class Param:
|
||||
@@ -433,11 +449,16 @@ class Client(SecopClient):
|
||||
removed_modules.append(modname)
|
||||
created_modules.append(modname)
|
||||
attrs = {}
|
||||
for pname, pinfo in moddesc['parameters'].items():
|
||||
params = moddesc['parameters']
|
||||
for pname, pinfo in params.items():
|
||||
attrs[pname] = Param(pname, pinfo['datainfo'])
|
||||
for cname in moddesc['commands']:
|
||||
attrs[cname] = Command(cname, modname, self)
|
||||
mobj = type(f'M_{modname}', (Module,), attrs)(modname, self)
|
||||
if 'value' in params:
|
||||
base = Writable if 'target' in params else Readable
|
||||
elif 'communicate' in moddesc['commands']:
|
||||
base = Communicator
|
||||
mobj = type(f'M_{modname}', (base,), attrs)(modname, self)
|
||||
if 'status' in mobj._parameters:
|
||||
self.register_callback((modname, 'status'), updateEvent=mobj._status_update)
|
||||
clientenv.namespace[modname] = mobj
|
||||
|
||||
Reference in new issue
Block a user