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

Remove deprecated constants #2974

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove deprecated constants #2974

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f21d54
Remove deprecate constants
OzGav Sep 28, 2024
82ceff8
Hopefully fix lint fail
OzGav Sep 28, 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
75 changes: 33 additions & 42 deletions custom_components/mass/media_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,9 @@
from typing import TYPE_CHECKING

from homeassistant.components import media_source
from homeassistant.components.media_player import BrowseError, BrowseMedia
from homeassistant.components.media_player.const import (
MEDIA_CLASS_ALBUM,
MEDIA_CLASS_ARTIST,
MEDIA_CLASS_DIRECTORY,
MEDIA_CLASS_MUSIC,
MEDIA_CLASS_PLAYLIST,
MEDIA_CLASS_TRACK,
MEDIA_TYPE_ALBUM,
MEDIA_TYPE_ARTIST,
MEDIA_TYPE_PLAYLIST,
MEDIA_TYPE_TRACK,
from homeassistant.components.media_player import (
BrowseError,
BrowseMedia,
MediaClass,
MediaType,
)
Expand All @@ -28,14 +19,14 @@
if TYPE_CHECKING:
from music_assistant.client import MusicAssistantClient

MEDIA_TYPE_RADIO = "radio"
MediaType.RADIO = "radio"

PLAYABLE_MEDIA_TYPES = [
MEDIA_TYPE_PLAYLIST,
MEDIA_TYPE_ALBUM,
MEDIA_TYPE_ARTIST,
MEDIA_TYPE_RADIO,
MEDIA_TYPE_TRACK,
MediaType.PLAYLIST,
MediaType.ALBUM,
MediaType.ARTIST,
MediaType.RADIO,
MediaType.TRACK,
]

LIBRARY_ARTISTS = "artists"
Expand All @@ -55,11 +46,11 @@
}

LIBRARY_MEDIA_CLASS_MAP = {
LIBRARY_ARTISTS: MEDIA_CLASS_ARTIST,
LIBRARY_ALBUMS: MEDIA_CLASS_ALBUM,
LIBRARY_TRACKS: MEDIA_CLASS_TRACK,
LIBRARY_PLAYLISTS: MEDIA_CLASS_PLAYLIST,
LIBRARY_RADIO: MEDIA_CLASS_MUSIC, # radio is not accepted by HA
LIBRARY_ARTISTS: MediaClass.ARTIST,
LIBRARY_ALBUMS: MediaClass.ALBUM,
LIBRARY_TRACKS: MediaClass.TRACK,
LIBRARY_PLAYLISTS: MediaClass.PLAYLIST,
LIBRARY_RADIO: MediaClass.MUSIC, # radio is not accepted by HA
}

MEDIA_CONTENT_TYPE_FLAC = "audio/flac"
Expand Down Expand Up @@ -123,7 +114,7 @@ async def build_main_listing(hass: HomeAssistant):
)
for library, media_class in LIBRARY_MEDIA_CLASS_MAP.items():
child_source = BrowseMedia(
media_class=MEDIA_CLASS_DIRECTORY,
media_class=MediaClass.DIRECTORY,
media_content_id=library,
media_content_type=DOMAIN,
title=LIBRARY_TITLE_MAP[library],
Expand Down Expand Up @@ -151,9 +142,9 @@ async def build_playlists_listing(mass: MusicAssistantClient):
"""Build Playlists browse listing."""
media_class = LIBRARY_MEDIA_CLASS_MAP[LIBRARY_PLAYLISTS]
return BrowseMedia(
media_class=MEDIA_CLASS_DIRECTORY,
media_class=MediaClass.DIRECTORY,
media_content_id=LIBRARY_PLAYLISTS,
media_content_type=MEDIA_TYPE_PLAYLIST,
media_content_type=MediaType.PLAYLIST,
title=LIBRARY_TITLE_MAP[LIBRARY_PLAYLISTS],
can_play=False,
can_expand=True,
Expand All @@ -176,13 +167,13 @@ async def build_playlist_items_listing(mass: MusicAssistantClient, identifier: s
playlist = await mass.music.get_item_by_uri(identifier)

return BrowseMedia(
media_class=MEDIA_CLASS_PLAYLIST,
media_class=MediaClass.PLAYLIST,
media_content_id=playlist.uri,
media_content_type=MEDIA_TYPE_PLAYLIST,
media_content_type=MediaType.PLAYLIST,
title=playlist.name,
can_play=True,
can_expand=True,
children_media_class=MEDIA_CLASS_TRACK,
children_media_class=MediaClass.TRACK,
children=[
build_item(mass, item, can_expand=False)
# we only grab the first page here because the
Expand All @@ -200,9 +191,9 @@ async def build_artists_listing(mass: MusicAssistantClient):
media_class = LIBRARY_MEDIA_CLASS_MAP[LIBRARY_ARTISTS]

return BrowseMedia(
media_class=MEDIA_CLASS_DIRECTORY,
media_class=MediaClass.DIRECTORY,
media_content_id=LIBRARY_ARTISTS,
media_content_type=MEDIA_TYPE_ARTIST,
media_content_type=MediaType.ARTIST,
title=LIBRARY_TITLE_MAP[LIBRARY_ARTISTS],
can_play=False,
can_expand=True,
Expand All @@ -226,13 +217,13 @@ async def build_artist_items_listing(mass: MusicAssistantClient, identifier: str
albums = await mass.music.get_artist_albums(artist.item_id, artist.provider)

return BrowseMedia(
media_class=MEDIA_TYPE_ARTIST,
media_class=MediaType.ARTIST,
media_content_id=artist.uri,
media_content_type=MEDIA_TYPE_ARTIST,
media_content_type=MediaType.ARTIST,
title=artist.name,
can_play=True,
can_expand=True,
children_media_class=MEDIA_CLASS_ALBUM,
children_media_class=MediaClass.ALBUM,
children=[
build_item(mass, album, can_expand=True)
for album in albums
Expand All @@ -246,9 +237,9 @@ async def build_albums_listing(mass: MusicAssistantClient):
media_class = LIBRARY_MEDIA_CLASS_MAP[LIBRARY_ALBUMS]

return BrowseMedia(
media_class=MEDIA_CLASS_DIRECTORY,
media_class=MediaClass.DIRECTORY,
media_content_id=LIBRARY_ALBUMS,
media_content_type=MEDIA_TYPE_ALBUM,
media_content_type=MediaType.ALBUM,
title=LIBRARY_TITLE_MAP[LIBRARY_ALBUMS],
can_play=False,
can_expand=True,
Expand All @@ -272,13 +263,13 @@ async def build_album_items_listing(mass: MusicAssistantClient, identifier: str)
tracks = await mass.music.get_album_tracks(album.item_id, album.provider)

return BrowseMedia(
media_class=MEDIA_TYPE_ALBUM,
media_class=MediaType.ALBUM,
media_content_id=album.uri,
media_content_type=MEDIA_TYPE_ALBUM,
media_content_type=MediaType.ALBUM,
title=album.name,
can_play=True,
can_expand=True,
children_media_class=MEDIA_CLASS_TRACK,
children_media_class=MediaClass.TRACK,
children=[
build_item(mass, track, False) for track in tracks if track.available
],
Expand All @@ -290,9 +281,9 @@ async def build_tracks_listing(mass: MusicAssistantClient):
media_class = LIBRARY_MEDIA_CLASS_MAP[LIBRARY_TRACKS]

return BrowseMedia(
media_class=MEDIA_CLASS_DIRECTORY,
media_class=MediaClass.DIRECTORY,
media_content_id=LIBRARY_ALBUMS,
media_content_type=MEDIA_TYPE_TRACK,
media_content_type=MediaType.TRACK,
title=LIBRARY_TITLE_MAP[LIBRARY_TRACKS],
can_play=False,
can_expand=True,
Expand All @@ -314,7 +305,7 @@ async def build_radio_listing(mass: MusicAssistantClient):
"""Build Radio browse listing."""
media_class = LIBRARY_MEDIA_CLASS_MAP[LIBRARY_RADIO]
return BrowseMedia(
media_class=MEDIA_CLASS_DIRECTORY,
media_class=MediaClass.DIRECTORY,
media_content_id=LIBRARY_ALBUMS,
media_content_type=DOMAIN,
title=LIBRARY_TITLE_MAP[LIBRARY_RADIO],
Expand Down
Loading