sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-04 20:32:21 +01:00
Code Issues Releases Wiki Activity

[core] Fix some extends cases (#6748)

Browse Source
This commit is contained in:
Jesse Hills
2024-05-16 14:11:54 +12:00
committed by GitHub
parent 247b2eee30
commit 7c243dafb3
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
esphome/config_helpers.py
View File

@@ -8,6 +8,9 @@ class Extend:
def __str__(self):
return f"!extend {self.value}"
def __repr__(self):
return f"Extend({self.value})"
def __eq__(self, b):
"""
Check if two Extend objects contain the same ID.
@@ -24,6 +27,9 @@ class Remove:
def __str__(self):
return f"!remove {self.value}"
def __repr__(self):
return f"Remove({self.value})"
def __eq__(self, b):
"""
Check if two Remove objects contain the same ID.
@@ -50,14 +56,19 @@ def merge_config(full_old, full_new):
return new
res = old.copy()
ids = {
v[CONF_ID]: i
v_id: i
for i, v in enumerate(res)
if CONF_ID in v and isinstance(v[CONF_ID], str)
if (v_id := v.get(CONF_ID)) and isinstance(v_id, str)
}
extend_ids = {
v_id.value: i
for i, v in enumerate(res)
if (v_id := v.get(CONF_ID)) and isinstance(v_id, Extend)
}
ids_to_delete = []
for v in new:
if CONF_ID in v:
new_id = v[CONF_ID]
if new_id := v.get(CONF_ID):
if isinstance(new_id, Extend):
new_id = new_id.value
if new_id in ids:
@@ -69,6 +80,14 @@ def merge_config(full_old, full_new):
if new_id in ids:
ids_to_delete.append(ids[new_id])
continue
elif (
new_id in extend_ids
): # When a package is extending a non-packaged item
extend_res = res[extend_ids[new_id]]
extend_res[CONF_ID] = new_id
new_v = merge(v, extend_res)
res[extend_ids[new_id]] = new_v
continue
else:
ids[new_id] = len(res)
res.append(v)