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

Fix #1781: compact_items expects dict but sometimes passed list #1862

Merged
merged 3 commits into from
Feb 14, 2024
Merged

Fix #1781: compact_items expects dict but sometimes passed list #1862

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b42bac
Fix #1781: compact_items expects dict but sometimes passed list
jacobswe Feb 1, 2024
dcb91db
Merge branch 'music-assistant:main' into main
jacobswe Feb 12, 2024
1429130
Make type checks guard clauses
jacobswe Feb 12, 2024
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
6 changes: 4 additions & 2 deletions custom_components/mass/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,16 @@ def compact_item(item: dict[str, Any]) -> dict[str, Any]:
item[key] = compact_item(value)
elif isinstance(value, list):
for subitem in value:
compact_item(subitem)
if isinstance(subitem, dict):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's always better to guard and breakout early. So in this case:

if not isinstance(subitem, dict):
continue

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw: maybe we also want to catch lists here ?

compact_item(subitem)
# item[key] = [compact_item(x) if isinstance(x, dict) else x for x in value]
return item

dict_result: dict[str, list[dict[str, Any]]] = result.to_dict()
for media_type_key in dict_result:
for item in dict_result[media_type_key]:
compact_item(item)
if isinstance(item, dict):
compact_item(item)
return dict_result

hass.services.async_register(
Expand Down
Loading