eva-shell 0.2.43__tar.gz → 0.2.45__tar.gz

{eva_shell-0.2.43 → eva_shell-0.2.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva-shell
-Version: 0.2.43
+Version: 0.2.45
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva_shell-0.2.43 → eva_shell-0.2.45}/eva4_shell/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.2.43'
+__version__ = '0.2.45'
 
 DEFAULT_REPOSITORY_URL = 'https://pub.bma.ai/eva4'

{eva_shell-0.2.43 → eva_shell-0.2.45}/eva4_shell/ap.py

@@ -765,10 +765,16 @@ def append_item_cli(root_sp):
     p = sp.add_parser('list', help='list items')
     p.add_argument('i', metavar='MASK').completer = ComplOID()
     p.add_argument('-n', metavar='NODE').completer = ComplNode()
+    p.add_argument('-x', '--regex', type=str, help='filter regular expression')
+
+    p = sp.add_parser('search', help='search items by OID regex (equal to list "#" with regex filter)')
+    p.add_argument('x', metavar='REGEX', type=str, help='OID regular expression')
+    p.add_argument('-n', metavar='NODE').completer = ComplNode()
 
     p = sp.add_parser('state', help='item states')
     p.add_argument('i', metavar='MASK').completer = ComplOID('state')
     p.add_argument('-y', '--full', action='store_true')
+    p.add_argument('-x', '--regex', type=str, help='filter regular expression')
 
     p = sp.add_parser('stream-info', help='item stream info')
     p.add_argument('i', metavar='MASK').completer = ComplOID('state')

{eva_shell-0.2.43 → eva_shell-0.2.45}/eva4_shell/cli.py

@@ -967,7 +967,7 @@ class CLI:
                         d['type'] = 'local'
                     try:
                         info = d.pop('info')
-                        d['version'] = info.get('version')
+                        d['ver'] = info.get('version')
                         d['build'] = info.get('build')
                     except KeyError:
                         pass
@@ -1060,10 +1060,10 @@ class CLI:
         data = call_rpc('spoint.list')
         print_result(data, cols=['name', 'source', 'port', 'version', 'build'])
 
-    def item_list(self, i, n=None):
+    def item_list(self, i, n=None, regex=None):
         data = call_rpc(
             'item.list',
-            dict(i=i, node=n),
+            dict(i=i, node=n, regex=regex)
         )
         print_result(data,
                      cols=[
@@ -1071,8 +1071,19 @@ class CLI:
                          't|n=set time|f=time', 'node', 'connected', 'enabled'
                      ])
 
-    def item_announce(self, i, n=None):
+    def item_search(self, x, n=None):
         data = call_rpc(
+            'item.list',
+            dict(i="#", node=n, regex=x)
+        )
+        print_result(data,
+                     cols=[
+                         'oid', 'status', 'value|l=20|n=value',
+                         't|n=set time|f=time', 'node', 'connected', 'enabled'
+                     ])
+
+    def item_announce(self, i, n=None):
+        call_rpc(
             'item.announce',
             dict(i=i, node=n),
         )
@@ -1179,10 +1190,10 @@ class CLI:
         call_rpc('item.disable', dict(i=i))
         ok()
 
-    def item_state(self, i, full):
+    def item_state(self, i, full, regex):
         data = call_rpc(
             'item.state',
-            dict(i=i, full=full),
+            dict(i=i, full=full, regex=regex)
         )
         print_result(data,
                      cols=[

{eva_shell-0.2.43 → eva_shell-0.2.45}/eva_shell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva-shell
-Version: 0.2.43
+Version: 0.2.45
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva_shell-0.2.43 → eva_shell-0.2.45}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.43'
+__version__ = '0.2.45'
 
 import setuptools