sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

[core] Ensure that a generated ID name is distinct from its type. (#6706)

Browse Source
This commit is contained in:
Clyde Stubbs
2024-05-09 13:08:30 +10:00
committed by Jesse Hills
parent 0883f0efd7
commit 26048d18ef
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/core/__init__.py
View File

@@ -340,6 +340,8 @@ class ID:
if self.id is None: if self.id is None:
base = str(self.type).replace("::", "_").lower() base = str(self.type).replace("::", "_").lower()
if base == self.type:
base = base + "_id"
name = "".join(c for c in base if c.isalnum() or c == "_") name = "".join(c for c in base if c.isalnum() or c == "_")
used = set(registered_ids) | set(RESERVED_IDS) | CORE.loaded_integrations used = set(registered_ids) | set(RESERVED_IDS) | CORE.loaded_integrations
self.id = ensure_unique_string(name, used) self.id = ensure_unique_string(name, used)