[cli][fetch] add "--type" option to filter the variables that we update

pyheatpump/cli.py

@@ -54,82 +54,93 @@ def run(host, port):
         reload=True)
 
 
+@click.option('--type', '-t', default=None, multiple=True)
 @cli.command()
-def fetch():
+def fetch(type):
     logger = logger_init()
 
     from pyheatpump import modbus
-    var_types = VariableType.getall()
 
-    # Analog - float
-    analog = var_types['Analog']
-    logger.info('Read analog variables in registers [{}, {}]'.format(
-        analog.start_address, analog.end_address
-    ))
-    res = modbus.read_holding_registers(analog.start_address, analog.end_address)
-
-    for r in range(len(res)):
-        var = Variable(**{
-            'type': analog,
-            'address': r + analog.start_address})
-
-        if not var.exists():
-            logger.info('Insert variable {}:{}'.format(
-                var.type, var.address))
-            var.insert()
+    if type is None:
+        var_types = VariableType.getall()
+    else:
+        var_types = {}
+        for label, var_type in VariableType.getall().items():
+            if label in type or var_type.slabel in type:
+                var_types[label] = var_type
 
-        val = VariableValue(**{
-            'type': var.type,
-            'address': var.address,
-            'value': res[r]})
-        val.insert()
+    # Analog - float
+    if 'Analog' in var_types.keys():
+        analog = var_types['Analog']
+        logger.info('Read analog variables in registers [{}, {}]'.format(
+            analog.start_address, analog.end_address
+        ))
+        res = modbus.read_holding_registers(analog.start_address, analog.end_address)
+
+        for r in range(len(res)):
+            var = Variable(**{
+                'type': analog,
+                'address': r + analog.start_address})
+
+            if not var.exists():
+                logger.info('Insert variable {}:{}'.format(
+                    var.type, var.address))
+                var.insert()
+
+            val = VariableValue(**{
+                'type': var.type,
+                'address': var.address,
+                'value': res[r]})
+            val.insert()
 
 
     # Integer - int
-    integer = var_types['Integer']
-    logger.info('Read integer variables in registers [{}, {}]'.format(
-        integer.start_address, integer.end_address
-    ))
-    res = modbus.read_holding_registers(integer.start_address, integer.end_address)
-
-    for r in range(len(res)):
-        var = Variable(**{
-            'type': integer,
-            'address': r + integer.start_address})
-
-        if not var.exists():
-            logger.info('Insert variable {}:{}'.format(
-                var.type, var.address))
-            var.insert()
-
-        val = VariableValue(**{
-            'type': var.type,
-            'address': var.address,
-            'value': res[r]})
-        val.insert()
+    if 'Integer' in var_types.keys():
+        integer = var_types['Integer']
+        logger.info('Read integer variables in registers [{}, {}]'.format(
+            integer.start_address, integer.end_address
+        ))
+        res = modbus.read_holding_registers(integer.start_address, integer.end_address)
+
+        for r in range(len(res)):
+            var = Variable(**{
+                'type': integer,
+                'address': r + integer.start_address})
+
+            if not var.exists():
+                logger.info('Insert variable {}:{}'.format(
+                    var.type, var.address))
+                var.insert()
+
+            val = VariableValue(**{
+                'type': var.type,
+                'address': var.address,
+                'value': res[r]})
+            val.insert()
 
     # Digital - bool
-    digital = var_types['Digital']
-    logger.info('Read digital variables in coils [{}, {}]'.format(
-        digital.start_address, digital.end_address
-    ))
-    res = modbus.read_coils(digital.start_address, digital.end_address)
-
-    for r in range(len(res)):
-        var = Variable(**{
-            'type': digital,
-            'address': r + digital.start_address})
-
-        if not var.exists():
-            logger.info('Insert variable {}:{}'.format(
-                var.type, var.address))
-            var.insert()
-
-        val = VariableValue(**{
-            'type': var.type,
-            'address': var.address,
-            'value': res[r]})
-        val.insert()
+    if 'Digital' in var_types.keys():
+        digital = var_types['Digital']
+        logger.info('Read digital variables in coils [{}, {}]'.format(
+            digital.start_address, digital.end_address
+        ))
+        res = modbus.read_coils(digital.start_address, digital.end_address)
+
+        for r in range(len(res)):
+            var = Variable(**{
+                'type': digital,
+                'address': r + digital.start_address})
+
+            if not var.exists():
+                logger.info('Insert variable {}:{}'.format(
+                    var.type, var.address))
+                var.insert()
+
+            val = VariableValue(**{
+                'type': var.type,
+                'address': var.address,
+                'value': res[r]})
+            val.insert()
 
     commit()
     logger.info('Successfully read all variables')
@@ -175,17 +186,17 @@ def supervise(since):
     }
 
     logger.info(build_url(post_url))
+    data = h.__dict__()
     try:
-        json.dumps(h.__dict__())
+        logger.debug(json.dumps(data))
     except Exception as e:
         print(e)
         sys.exit(1)
 
-    logger.debug(h.__dict__())
 
     post_resp = requests.post(
         url=build_url(post_url),
-        json=h.__dict__(),
+        json=data,
         verify=False
     )
     if post_resp.status_code == 200: