mirror of
https://github.com/tomaae/homeassistant-mikrotik_router.git
synced 2025-07-13 19:04:30 +02:00
moved keymap matching into get_uid
This commit is contained in:
parent
f3a4b19d68
commit
20a35a5f40
1 changed files with 13 additions and 8 deletions
|
@ -51,9 +51,7 @@ async def from_list(data=None, source=None, key=None, key_search=None, vals=[],
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# get uid
|
# get uid
|
||||||
uid = await get_uid(entry, key)
|
uid = await get_uid(entry, key, key_search, keymap)
|
||||||
if keymap and key_search in entry and entry[key_search] in keymap:
|
|
||||||
uid = keymap[entry[key_search]]
|
|
||||||
|
|
||||||
if not uid:
|
if not uid:
|
||||||
continue
|
continue
|
||||||
|
@ -93,12 +91,19 @@ async def from_list(data=None, source=None, key=None, key_search=None, vals=[],
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
# get_uid
|
# get_uid
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
async def get_uid(entry, key):
|
async def get_uid(entry, key, key_search, keymap):
|
||||||
if key not in entry:
|
if not key_search:
|
||||||
return False
|
if key not in entry:
|
||||||
|
return False
|
||||||
|
|
||||||
if not entry[key]:
|
if not entry[key]:
|
||||||
return False
|
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]
|
return entry[key]
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue