From 212d9c9aa920e771cb337c53092be52f7d739419 Mon Sep 17 00:00:00 2001
From: Tomaae <23486452+tomaae@users.noreply.github.com>
Date: Thu, 12 Dec 2019 08:59:36 +0100
Subject: [PATCH] made val optional in helper added val_proc with support cor
 combining string

---
 custom_components/mikrotik_router/helper.py | 41 ++++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/custom_components/mikrotik_router/helper.py b/custom_components/mikrotik_router/helper.py
index d8bda85..411b7b4 100644
--- a/custom_components/mikrotik_router/helper.py
+++ b/custom_components/mikrotik_router/helper.py
@@ -37,7 +37,7 @@ def from_entry_bool(entry, param, default=False, reverse=False):
 # ---------------------------
 #   from_list
 # ---------------------------
-async def from_list(data=None, source=None, key=None, key_search=None, vals=[], ensure_vals=None, only=None, skip=None):
+async def from_list(data=None, source=None, key=None, key_search=None, vals=None, val_proc=None, ensure_vals=None, only=None, skip=None):
     if not source:
         return data
 
@@ -62,10 +62,15 @@ async def from_list(data=None, source=None, key=None, key_search=None, vals=[],
             uid=None
 
         _LOGGER.debug("Processing entry {}, entry {}".format(source, entry))
-        data = await fill_vals(data, uid, vals)
+        if vals:
+            data = await fill_vals(data, uid, vals)
+
         if ensure_vals:
             data = await fill_ensure_vals(data, uid, ensure_vals)
 
+        if val_proc:
+            data = await fill_vals_proc(data, uid, val_proc)
+
     return data
 
 
@@ -179,3 +184,35 @@ async def fill_ensure_vals(data, uid, ensure_vals):
                 data[val['name']] = _default
 
     return data
+
+# ---------------------------
+#   fill_vals_proc
+# ---------------------------
+async def fill_vals_proc(data, uid, vals_proc):
+    
+    _data = data[uid] if uid else data
+    for val_sub in val_proc:
+        _name = None
+        _action = None
+        _value = None
+        for val in val_sub:
+            if 'name' in val:
+                _name = val['name']
+                continue
+
+            if 'action' in val:
+                _action = val['action']
+                continue
+
+            if not _name and not _action:
+                break
+
+            if _action == 'combine':
+                if 'key' in val:
+                    _value += _data[val['key']] if val['key'] in _data else 'unknown'
+
+                if 'text' in val:
+                    _value += val['text']
+
+    return data
+