jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard for spotify items without type (#39795)

Browse Source 
Co-authored-by: Bram Kragten <mail@bramkragten.nl>
This commit is contained in:
Paulus Schoutsen 2020-09-08 15:23:29 +02:00
parent 214fc04473
commit 71c2557405
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
homeassistant/components/spotify/media_player.py
View File

@ -437,16 +437,16 @@ def build_item_response(spotify, user, payload):
items = media.get("artists", {}).get("items", []) items = media.get("artists", {}).get("items", [])
elif media_content_type == "current_user_saved_albums": elif media_content_type == "current_user_saved_albums":
media = spotify.current_user_saved_albums(limit=BROWSE_LIMIT) media = spotify.current_user_saved_albums(limit=BROWSE_LIMIT)
items = media.get("items", []) items = [item["album"] for item in media.get("items", [])]
elif media_content_type == "current_user_saved_tracks": elif media_content_type == "current_user_saved_tracks":
media = spotify.current_user_saved_tracks(limit=BROWSE_LIMIT) media = spotify.current_user_saved_tracks(limit=BROWSE_LIMIT)
items = media.get("items", []) items = [item["track"] for item in media.get("items", [])]
elif media_content_type == "current_user_saved_shows": elif media_content_type == "current_user_saved_shows":
media = spotify.current_user_saved_shows(limit=BROWSE_LIMIT) media = spotify.current_user_saved_shows(limit=BROWSE_LIMIT)
items = media.get("items", []) items = [item["show"] for item in media.get("items", [])]
elif media_content_type == "current_user_recently_played": elif media_content_type == "current_user_recently_played":
media = spotify.current_user_recently_played(limit=BROWSE_LIMIT) media = spotify.current_user_recently_played(limit=BROWSE_LIMIT)
items = media.get("items", []) items = [item["track"] for item in media.get("items", [])]
elif media_content_type == "current_user_top_artists": elif media_content_type == "current_user_top_artists":
media = spotify.current_user_top_artists(limit=BROWSE_LIMIT) media = spotify.current_user_top_artists(limit=BROWSE_LIMIT)
items = media.get("items", []) items = media.get("items", [])
@ -474,7 +474,7 @@ def build_item_response(spotify, user, payload):
items = media.get("albums", {}).get("items", []) items = media.get("albums", {}).get("items", [])
elif media_content_type == MEDIA_TYPE_PLAYLIST: elif media_content_type == MEDIA_TYPE_PLAYLIST:
media = spotify.playlist(media_content_id) media = spotify.playlist(media_content_id)
items = media.get("tracks", {}).get("items", []) items = [item["track"] for item in media.get("tracks", {}).get("items", [])]
elif media_content_type == MEDIA_TYPE_ALBUM: elif media_content_type == MEDIA_TYPE_ALBUM:
media = spotify.album(media_content_id) media = spotify.album(media_content_id)
items = media.get("tracks", {}).get("items", []) items = media.get("tracks", {}).get("items", [])
@ -546,14 +546,6 @@ def item_payload(item):
Used by async_browse_media. Used by async_browse_media.
""" """
if MEDIA_TYPE_TRACK in item:
item = item[MEDIA_TYPE_TRACK]
elif MEDIA_TYPE_SHOW in item:
item = item[MEDIA_TYPE_SHOW]
elif MEDIA_TYPE_ARTIST in item:
item = item[MEDIA_TYPE_ARTIST]
elif MEDIA_TYPE_ALBUM in item and item["type"] != MEDIA_TYPE_TRACK:
item = item[MEDIA_TYPE_ALBUM]
can_expand = item["type"] not in [ can_expand = item["type"] not in [
MEDIA_TYPE_TRACK, MEDIA_TYPE_TRACK,