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

moved keymap matching into get_uid

Browse source
This commit is contained in:
Tomaae 2019-12-11 13:08:12 +01:00
parent f3a4b19d68
commit 20a35a5f40
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
custom_components/mikrotik_router/helper.py
View file

@ -51,9 +51,7 @@ async def from_list(data=None, source=None, key=None, key_search=None, vals=[],
continue
# get uid
uid = await get_uid(entry, key)
if keymap and key_search in entry and entry[key_search] in keymap:
uid = keymap[entry[key_search]]
uid = await get_uid(entry, key, key_search, keymap)
if not uid:
continue
@ -93,12 +91,19 @@ async def from_list(data=None, source=None, key=None, key_search=None, vals=[],
# ---------------------------
# get_uid
# ---------------------------
async def get_uid(entry, key):
if key not in entry:
return False
async def get_uid(entry, key, key_search, keymap):
if not key_search:
if key not in entry:
return False
if not entry[key]:
return False
if not entry[key]:
return False
else:
if not keymap or key_search not in entry or entry[key_search] not in keymap:
return False
uid = keymap[entry[key_search]]
return entry[key]