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

Use new media player enums in kodi (#78106)

Browse Source
This commit is contained in:
epenet 2022-09-10 22:22:18 +02:00 committed by GitHub
parent a2559b48ce
commit d0605d3a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
homeassistant/components/kodi/media_player.py
View File

@ -16,28 +16,14 @@ import voluptuous as vol
from homeassistant.components import media_source from homeassistant.components import media_source
from homeassistant.components.media_player import ( from homeassistant.components.media_player import (
PLATFORM_SCHEMA, PLATFORM_SCHEMA,
BrowseError,
BrowseMedia,
MediaPlayerEntity, MediaPlayerEntity,
MediaPlayerEntityFeature, MediaPlayerEntityFeature,
) MediaPlayerState,
from homeassistant.components.media_player.browse_media import ( MediaType,
BrowseMedia,
async_process_play_media_url, async_process_play_media_url,
) )
from homeassistant.components.media_player.const import (
MEDIA_TYPE_ALBUM,
MEDIA_TYPE_ARTIST,
MEDIA_TYPE_CHANNEL,
MEDIA_TYPE_EPISODE,
MEDIA_TYPE_MOVIE,
MEDIA_TYPE_MUSIC,
MEDIA_TYPE_PLAYLIST,
MEDIA_TYPE_SEASON,
MEDIA_TYPE_TRACK,
MEDIA_TYPE_TVSHOW,
MEDIA_TYPE_URL,
MEDIA_TYPE_VIDEO,
)
from homeassistant.components.media_player.errors import BrowseError
from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
@ -50,10 +36,6 @@ from homeassistant.const import (
CONF_TIMEOUT, CONF_TIMEOUT,
CONF_USERNAME, CONF_USERNAME,
EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STARTED,
STATE_IDLE,
STATE_OFF,
STATE_PAUSED,
STATE_PLAYING,
) )
from homeassistant.core import CoreState, HomeAssistant, callback from homeassistant.core import CoreState, HomeAssistant, callback
from homeassistant.helpers import ( from homeassistant.helpers import (
@ -112,28 +94,28 @@ WEBSOCKET_WATCHDOG_INTERVAL = timedelta(seconds=10)
# https://github.com/xbmc/xbmc/blob/master/xbmc/media/MediaType.h # https://github.com/xbmc/xbmc/blob/master/xbmc/media/MediaType.h
MEDIA_TYPES = { MEDIA_TYPES = {
"music": MEDIA_TYPE_MUSIC, "music": MediaType.MUSIC,
"artist": MEDIA_TYPE_MUSIC, "artist": MediaType.MUSIC,
"album": MEDIA_TYPE_MUSIC, "album": MediaType.MUSIC,
"song": MEDIA_TYPE_MUSIC, "song": MediaType.MUSIC,
"video": MEDIA_TYPE_VIDEO, "video": MediaType.VIDEO,
"set": MEDIA_TYPE_PLAYLIST, "set": MediaType.PLAYLIST,
"musicvideo": MEDIA_TYPE_VIDEO, "musicvideo": MediaType.VIDEO,
"movie": MEDIA_TYPE_MOVIE, "movie": MediaType.MOVIE,
"tvshow": MEDIA_TYPE_TVSHOW, "tvshow": MediaType.TVSHOW,
"season": MEDIA_TYPE_TVSHOW, "season": MediaType.TVSHOW,
"episode": MEDIA_TYPE_TVSHOW, "episode": MediaType.TVSHOW,
# Type 'channel' is used for radio or tv streams from pvr # Type 'channel' is used for radio or tv streams from pvr
"channel": MEDIA_TYPE_CHANNEL, "channel": MediaType.CHANNEL,
# Type 'audio' is used for audio media, that Kodi couldn't scroblle # Type 'audio' is used for audio media, that Kodi couldn't scroblle
"audio": MEDIA_TYPE_MUSIC, "audio": MediaType.MUSIC,
} }
MAP_KODI_MEDIA_TYPES = { MAP_KODI_MEDIA_TYPES: dict[MediaType | str, str] = {
MEDIA_TYPE_MOVIE: "movieid", MediaType.MOVIE: "movieid",
MEDIA_TYPE_EPISODE: "episodeid", MediaType.EPISODE: "episodeid",
MEDIA_TYPE_SEASON: "seasonid", MediaType.SEASON: "seasonid",
MEDIA_TYPE_TVSHOW: "tvshowid", MediaType.TVSHOW: "tvshowid",
} }
@ -259,7 +241,7 @@ def cmd(
await func(obj, *args, **kwargs) await func(obj, *args, **kwargs)
except (TransportError, ProtocolError) as exc: except (TransportError, ProtocolError) as exc:
# If Kodi is off, we expect calls to fail. # If Kodi is off, we expect calls to fail.
if obj.state == STATE_OFF: if obj.state == MediaPlayerState.OFF:
log_function = _LOGGER.debug log_function = _LOGGER.debug
else: else:
log_function = _LOGGER.error log_function = _LOGGER.error
@ -380,18 +362,18 @@ class KodiEntity(MediaPlayerEntity):
) )
@property @property
def state(self): def state(self) -> MediaPlayerState:
"""Return the state of the device.""" """Return the state of the device."""
if self._kodi_is_off: if self._kodi_is_off:
return STATE_OFF return MediaPlayerState.OFF
if self._no_active_players: if self._no_active_players:
return STATE_IDLE return MediaPlayerState.IDLE
if self._properties["speed"] == 0: if self._properties["speed"] == 0:
return STATE_PAUSED return MediaPlayerState.PAUSED
return STATE_PLAYING return MediaPlayerState.PLAYING
async def async_added_to_hass(self) -> None: async def async_added_to_hass(self) -> None:
"""Connect the websocket if needed.""" """Connect the websocket if needed."""
@ -703,11 +685,11 @@ class KodiEntity(MediaPlayerEntity):
@cmd @cmd
async def async_play_media( async def async_play_media(
self, media_type: str, media_id: str, **kwargs: Any self, media_type: MediaType | str, media_id: str, **kwargs: Any
) -> None: ) -> None:
"""Send the play_media command to the media player.""" """Send the play_media command to the media player."""
if media_source.is_media_source_id(media_id): if media_source.is_media_source_id(media_id):
media_type = MEDIA_TYPE_URL media_type = MediaType.URL
play_item = await media_source.async_resolve_media( play_item = await media_source.async_resolve_media(
self.hass, media_id, self.entity_id self.hass, media_id, self.entity_id
) )
@ -715,27 +697,27 @@ class KodiEntity(MediaPlayerEntity):
media_type_lower = media_type.lower() media_type_lower = media_type.lower()
if media_type_lower == MEDIA_TYPE_CHANNEL: if media_type_lower == MediaType.CHANNEL:
await self._kodi.play_channel(int(media_id)) await self._kodi.play_channel(int(media_id))
elif media_type_lower == MEDIA_TYPE_PLAYLIST: elif media_type_lower == MediaType.PLAYLIST:
await self._kodi.play_playlist(int(media_id)) await self._kodi.play_playlist(int(media_id))
elif media_type_lower == "file": elif media_type_lower == "file":
await self._kodi.play_file(media_id) await self._kodi.play_file(media_id)
elif media_type_lower == "directory": elif media_type_lower == "directory":
await self._kodi.play_directory(media_id) await self._kodi.play_directory(media_id)
elif media_type_lower in [ elif media_type_lower in [
MEDIA_TYPE_ARTIST, MediaType.ARTIST,
MEDIA_TYPE_ALBUM, MediaType.ALBUM,
MEDIA_TYPE_TRACK, MediaType.TRACK,
]: ]:
await self.async_clear_playlist() await self.async_clear_playlist()
await self.async_add_to_playlist(media_type_lower, media_id) await self.async_add_to_playlist(media_type_lower, media_id)
await self._kodi.play_playlist(0) await self._kodi.play_playlist(0)
elif media_type_lower in [ elif media_type_lower in [
MEDIA_TYPE_MOVIE, MediaType.MOVIE,
MEDIA_TYPE_EPISODE, MediaType.EPISODE,
MEDIA_TYPE_SEASON, MediaType.SEASON,
MEDIA_TYPE_TVSHOW, MediaType.TVSHOW,
]: ]:
await self._kodi.play_item( await self._kodi.play_item(
{MAP_KODI_MEDIA_TYPES[media_type_lower]: int(media_id)} {MAP_KODI_MEDIA_TYPES[media_type_lower]: int(media_id)}
@ -796,11 +778,11 @@ class KodiEntity(MediaPlayerEntity):
async def async_add_to_playlist(self, media_type, media_id): async def async_add_to_playlist(self, media_type, media_id):
"""Add media item to default playlist (i.e. playlistid=0).""" """Add media item to default playlist (i.e. playlistid=0)."""
if media_type == MEDIA_TYPE_ARTIST: if media_type == MediaType.ARTIST:
await self._kodi.add_artist_to_playlist(int(media_id)) await self._kodi.add_artist_to_playlist(int(media_id))
elif media_type == MEDIA_TYPE_ALBUM: elif media_type == MediaType.ALBUM:
await self._kodi.add_album_to_playlist(int(media_id)) await self._kodi.add_album_to_playlist(int(media_id))
elif media_type == MEDIA_TYPE_TRACK: elif media_type == MediaType.TRACK:
await self._kodi.add_song_to_playlist(int(media_id)) await self._kodi.add_song_to_playlist(int(media_id))
async def async_add_media_to_playlist( async def async_add_media_to_playlist(