eva-shell 0.2.24__tar.gz → 0.2.26__tar.gz

{eva-shell-0.2.24 → eva-shell-0.2.26}/PKG-INFO

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

{eva-shell-0.2.24 → eva-shell-0.2.26}/eva4_shell/__init__.py

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

{eva-shell-0.2.24 → eva-shell-0.2.26}/eva4_shell/ap.py

@@ -263,7 +263,14 @@ def append_alarm_cli(root_sp):
     p = sp.add_parser('state', help='alarm state')
     p.add_argument('--node', metavar='NODE', help='filter by node')
     p.add_argument('--group', metavar='GROUP', help='filter by group')
-    p.add_argument('--level', metavar='LEVEL', help='filter by level')
+    p.add_argument('--level-min',
+                   metavar='LEVEL_MIN',
+                   type=int,
+                   help='filter by min level')
+    p.add_argument('--level-max',
+                   metavar='LEVEL_MAX',
+                   type=int,
+                   help='filter by max level')
     p.add_argument('--id', metavar='ID', help='filter by ID')
     p.add_argument('--current',
                    choices=ALARM_CURRENT_CODES,
@@ -812,7 +819,7 @@ def append_item_cli(root_sp):
     p = sp.add_parser('edit', help='edit item config')
     p.add_argument('i', metavar='OID').completer = ComplOID()
 
-    p = sp.add_parser('set', help='forcibly set item state')
+    p = sp.add_parser('set', help='set item state')
     p.add_argument('i', metavar='OID').completer = ComplOID()
     p.add_argument('value', metavar='VALUE')
     p.add_argument('-s', '--status', metavar='STATUS', type=int)
@@ -821,6 +828,13 @@ def append_item_cli(root_sp):
                    dest='p',
                    metavar='TYPE',
                    choices=['auto', 'json'])
+    p.add_argument(
+        '-F',
+        '--force',
+        action='store_true',
+        help=
+        'Forcibly modify item state even if it is the same, also sets state for a disabled item'
+    )
 
     sp.add_parser('summary', help='item summary per source')
 

{eva-shell-0.2.24 → eva-shell-0.2.26}/eva4_shell/cli.py

@@ -1073,11 +1073,11 @@ class CLI:
                 print(f'{c} item(s) exported')
                 print()
 
-    def item_set(self, i, status, value, p):
+    def item_set(self, i, status, value, p, force):
         val = format_value(value, p=p)
         payload = dict(status=1 if status is None else status,
                        value=val,
-                       force=True)
+                       force=force)
         connect()
         common.bus.send(
             'RAW/' + i.replace(':', '/', 1),
@@ -1897,7 +1897,8 @@ class CLI:
     def alarm_state(self,
                     alarm_svc,
                     node=None,
-                    level=None,
+                    level_min=None,
+                    level_max=None,
                     group=None,
                     id=None,
                     current=None,
@@ -1907,8 +1908,10 @@ class CLI:
         flt = {}
         if node:
             flt['node'] = node
-        if level is not None:
-            flt['level'] = level
+        if level_min:
+            flt['level_min'] = level_min
+        if level_max:
+            flt['level_max'] = level_max
         if group:
             flt['group'] = group
         if id:

{eva-shell-0.2.24 → eva-shell-0.2.26}/eva_shell.egg-info/PKG-INFO

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

{eva-shell-0.2.24 → eva-shell-0.2.26}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.24'
+__version__ = '0.2.26'
 
 import setuptools