Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gracefully handle unexpected config types #201

Merged
merged 1 commit into from
Jun 2, 2023
Merged

Gracefully handle unexpected config types #201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions custom_components/spook/repairs/lovelace_unknown_entity_references.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ async def async_inspect(self) -> None:
def __async_extract_entities(self, config: dict[str, Any]) -> set[str]:
"""Extract entities from a dashboard config."""
entities = set()
if views := config.get("views"):
if isinstance(config, dict) and (views := config.get("views")):
for view in views:
if badges := view.get("badges"):
for badge in badges:
Expand Down Expand Up @@ -197,10 +197,11 @@ def __async_extract_entities_from_badge(
"""Extract entities from a dashboard badge config."""
if isinstance(config, str):
return {config}
if (entity_id := config.get("entity")) and isinstance(entity_id, str):
return {config["entity"]}
if (entities := config.get("entities")) and isinstance(entities, list):
return set(config["entities"])
if isinstance(config, dict):
if (entity_id := config.get("entity")) and isinstance(entity_id, str):
return {config["entity"]}
if (entities := config.get("entities")) and isinstance(entities, list):
return set(config["entities"])
return set()

@callback
Expand All @@ -209,6 +210,9 @@ def __async_extract_entities_from_card( # noqa: C901
config: dict[str, Any],
) -> set[str]:
"""Extract entities from a dashboard card config."""
if not isinstance(config, dict):
return set()

entities = self.__async_extract_common(config)
entities.update(self.__async_extract_entities_from_actions(config))

Expand Down Expand Up @@ -285,6 +289,9 @@ def __async_extract_entities_from_condition(
@callback
def __async_extract_entities_from_element(self, config: dict[str, Any]) -> set[str]:
"""Extract entities from a dashboard element config."""
if not isinstance(config, dict):
return set()

entities = self.__async_extract_common(config)
entities.update(self.__async_extract_entities_from_actions(config))
entities.update(self.__async_extract_entities_from_action(config))
Expand Down