mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-07-16 20:34:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

added support for only and skip in helper

Browse source 
added test for ensure_vals
This commit is contained in:
Tomaae 2019-12-11 13:03:09 +01:00
parent 057e6f91b7
commit f3a4b19d68
1 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

49
custom_components/mikrotik_router/helper.py
View file

@ -37,13 +37,20 @@ def from_entry_bool(entry, param, default=False, reverse=False):
# --------------------------- # ---------------------------
# from_list # from_list
# --------------------------- # ---------------------------
async def from_list(data=None, source=None, key=None, key_search=None, vals=[], ensure_vals=[]): async def from_list(data=None, source=None, key=None, key_search=None, vals=[], ensure_vals=None, only=None, skip=None):
if not source: if not source:
return data return data
keymap = generate_keymap(data, key_search) keymap = generate_keymap(data, key_search)
for entry in source: for entry in source:
if only and not await matches_only(entry, only):
continue
if skip and await can_skip(entry, skip):
continue
# get uid
uid = await get_uid(entry, key) uid = await get_uid(entry, key)
if keymap and key_search in entry and entry[key_search] in keymap: if keymap and key_search in entry and entry[key_search] in keymap:
uid = keymap[entry[key_search]] uid = keymap[entry[key_search]]
@ -54,6 +61,7 @@ async def from_list(data=None, source=None, key=None, key_search=None, vals=[],
if uid not in data: if uid not in data:
data[uid] = {} data[uid] = {}
# vals
_LOGGER.debug("Processing entry {}, entry {}".format(source, entry)) _LOGGER.debug("Processing entry {}, entry {}".format(source, entry))
for val in vals: for val in vals:
_name = val['name'] _name = val['name']
@ -66,15 +74,18 @@ async def from_list(data=None, source=None, key=None, key_search=None, vals=[],
_default = val[val['default_val']] _default = val[val['default_val']]
data[uid][_name] = from_entry(entry, _source, default=_default) data[uid][_name] = from_entry(entry, _source, default=_default)
elif _type == 'bool': elif _type == 'bool':
_default = val['default'] if 'default' in val else False _default = val['default'] if 'default' in val else False
_reverse = val['reverse'] if 'reverse' in val else False _reverse = val['reverse'] if 'reverse' in val else False
data[uid][_name] = from_entry_bool(entry, _source, default=_default, reverse=_reverse) data[uid][_name] = from_entry_bool(entry, _source, default=_default, reverse=_reverse)
for val in ensure_vals: # ensure_vals
if val['name'] not in data[uid]: if ensure_vals:
_default = val['default'] if 'default' in val else '' for val in ensure_vals:
data[uid][val['name']] = _default if val['name'] not in data[uid]:
_default = val['default'] if 'default' in val else ''
data[uid][val['name']] = _default
return data return data
@ -106,3 +117,31 @@ async def generate_keymap(data, key_search):
keymap[data[uid]['name']] = data[uid]['default-name'] keymap[data[uid]['name']] = data[uid]['default-name']
return keymap return keymap
# ---------------------------
# matches_only
# ---------------------------
async def matches_only(entry, only):
can_continue = False
for val in only:
if val['name'] in entry and entry[val['name']] == val['value']:
can_continue = True
else:
can_continue = False
break
return can_continue
# ---------------------------
# can_skip
# ---------------------------
async def can_skip(entry, skip):
can_skip = False
for val in skip:
if val['name'] in entry and entry[val['name']] == val['value']:
can_skip = True
break
return can_skip