diff --git a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html index e36970f325c..9d16ab9e561 100644 --- a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html +++ b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html @@ -131,7 +131,7 @@ this.isOff = newVal.state == 'off'; this.isPlaying = newVal.state == 'playing'; this.volumeSliderValue = newVal.attributes.volume_level * 100; - this.isMuted = newVal.attributes.volume_muted; + this.isMuted = newVal.attributes.is_volume_muted; this.supportsPause = (newVal.attributes.supported_media_commands & 1) !== 0; this.supportsVolumeSet = (newVal.attributes.supported_media_commands & 4) !== 0; this.supportsVolumeMute = (newVal.attributes.supported_media_commands & 8) !== 0; @@ -192,7 +192,7 @@ if (!this.supportsVolumeMute) { return; } - this.callService('volume_mute', { volume_muted: !this.isMuted }); + this.callService('volume_mute', { is_volume_muted: !this.isMuted }); }, volumeSliderChanged: function(ev) { diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py index 4116f1c4d28..0071760967f 100644 --- a/homeassistant/components/media_player/__init__.py +++ b/homeassistant/components/media_player/__init__.py @@ -30,14 +30,15 @@ DISCOVERY_PLATFORMS = { SERVICE_YOUTUBE_VIDEO = 'play_youtube_video' ATTR_MEDIA_VOLUME_LEVEL = 'volume_level' -ATTR_MEDIA_VOLUME_MUTED = 'volume_muted' +ATTR_MEDIA_VOLUME_MUTED = 'is_volume_muted' ATTR_MEDIA_SEEK_POSITION = 'seek_position' ATTR_MEDIA_CONTENT_ID = 'media_content_id' ATTR_MEDIA_CONTENT_TYPE = 'media_content_type' ATTR_MEDIA_DURATION = 'media_duration' ATTR_MEDIA_TITLE = 'media_title' ATTR_MEDIA_ARTIST = 'media_artist' -ATTR_MEDIA_ALBUM = 'media_album' +ATTR_MEDIA_ALBUM_NAME = 'media_album_name' +ATTR_MEDIA_ALBUM_ARTIST = 'media_album_artist' ATTR_MEDIA_TRACK = 'media_track' ATTR_MEDIA_SERIES_TITLE = 'media_series_title' ATTR_MEDIA_SEASON = 'media_season' @@ -74,24 +75,24 @@ SERVICE_TO_METHOD = { SERVICE_MEDIA_PREVIOUS_TRACK: 'media_previous_track', } -ATTR_TO_PROPERTY = { - ATTR_MEDIA_VOLUME_LEVEL: 'volume_level', - ATTR_MEDIA_VOLUME_MUTED: 'is_volume_muted', - ATTR_MEDIA_CONTENT_ID: 'media_content_id', - ATTR_MEDIA_CONTENT_TYPE: 'media_content_type', - ATTR_MEDIA_DURATION: 'media_duration', - ATTR_ENTITY_PICTURE: 'media_image_url', - ATTR_MEDIA_TITLE: 'media_title', - ATTR_MEDIA_ARTIST: 'media_artist', - ATTR_MEDIA_ALBUM: 'media_album', - ATTR_MEDIA_TRACK: 'media_track', - ATTR_MEDIA_SERIES_TITLE: 'media_series_title', - ATTR_MEDIA_SEASON: 'media_season', - ATTR_MEDIA_EPISODE: 'media_episode', - ATTR_APP_ID: 'app_id', - ATTR_APP_NAME: 'app_name', - ATTR_SUPPORTED_MEDIA_COMMANDS: 'supported_media_commands', -} +ATTR_TO_PROPERTY = [ + ATTR_MEDIA_VOLUME_LEVEL, + ATTR_MEDIA_VOLUME_MUTED, + ATTR_MEDIA_CONTENT_ID, + ATTR_MEDIA_CONTENT_TYPE, + ATTR_MEDIA_DURATION, + ATTR_MEDIA_TITLE, + ATTR_MEDIA_ARTIST, + ATTR_MEDIA_ALBUM_NAME, + ATTR_MEDIA_ALBUM_ARTIST, + ATTR_MEDIA_TRACK, + ATTR_MEDIA_SERIES_TITLE, + ATTR_MEDIA_SEASON, + ATTR_MEDIA_EPISODE, + ATTR_APP_ID, + ATTR_APP_NAME, + ATTR_SUPPORTED_MEDIA_COMMANDS, +] def is_on(hass, entity_id=None): @@ -242,10 +243,7 @@ def setup(hass, config): if player.should_poll: player.update_ha_state(True) - hass.services.register(DOMAIN, SERVICE_VOLUME_MUTE, - lambda service: - volume_mute_service( - service, )) + hass.services.register(DOMAIN, SERVICE_VOLUME_MUTE, volume_mute_service) def media_seek_service(service): """ Seek to a position. """ @@ -262,10 +260,7 @@ def setup(hass, config): if player.should_poll: player.update_ha_state(True) - hass.services.register(DOMAIN, SERVICE_MEDIA_SEEK, - lambda service: - media_seek_service( - service, )) + hass.services.register(DOMAIN, SERVICE_MEDIA_SEEK, media_seek_service) def play_youtube_video_service(service, media_id): """ Plays specified media_id on the media player. """ @@ -346,8 +341,13 @@ class MediaPlayerDevice(Entity): return None @property - def media_album(self): - """ Album of current playing media. (Music track only) """ + def media_album_name(self): + """ Album name of current playing media. (Music track only) """ + return None + + @property + def media_album_artist(self): + """ Album arist of current playing media. (Music track only) """ return None @property @@ -490,10 +490,13 @@ class MediaPlayerDevice(Entity): state_attr = {} else: state_attr = { - attr: getattr(self, prop) for attr, prop - in ATTR_TO_PROPERTY.items() if getattr(self, prop) + attr: getattr(self, attr) for attr + in ATTR_TO_PROPERTY if getattr(self, attr) } + if self.media_image_url: + state_attr[ATTR_ENTITY_PICTURE] = self.media_image_url + device_attr = self.device_state_attributes if device_attr: diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py index 61515f5354a..77cdf79a112 100644 --- a/homeassistant/components/media_player/cast.py +++ b/homeassistant/components/media_player/cast.py @@ -21,11 +21,14 @@ from homeassistant.const import ( from homeassistant.components.media_player import ( MediaPlayerDevice, SUPPORT_PAUSE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_MUTE, - SUPPORT_YOUTUBE, - SUPPORT_TURN_ON, SUPPORT_TURN_OFF, - SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK) + SUPPORT_TURN_ON, SUPPORT_TURN_OFF, SUPPORT_YOUTUBE, + SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK, + MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_VIDEO) CAST_SPLASH = 'https://home-assistant.io/images/cast/splash.png' +SUPPORT_CAST = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \ + SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PREVIOUS_TRACK | \ + SUPPORT_NEXT_TRACK | SUPPORT_YOUTUBE # pylint: disable=unused-argument @@ -61,6 +64,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None): class CastDevice(MediaPlayerDevice): """ Represents a Cast device on the network. """ + # pylint: disable=too-many-public-methods + def __init__(self, host): self.cast = pychromecast.Chromecast(host) self.youtube = youtube.YouTubeController() @@ -73,7 +78,7 @@ class CastDevice(MediaPlayerDevice): self.cast_status = self.cast.status self.media_status = self.cast.media_controller.status - """Entity properties and methods""" + # Entity properties and methods @property def should_poll(self): @@ -84,18 +89,18 @@ class CastDevice(MediaPlayerDevice): """ Returns the name of the device. """ return self.cast.device.friendly_name - """MediaPlayerDevice properties and methods""" + # MediaPlayerDevice properties and methods @property def state(self): """ State of the player. """ - media_controller = self.cast.media_controller - - if media_controller.is_playing: + if self.media_status is None: + return STATE_UNKNOWN + elif self.media_status.player_is_playing: return STATE_PLAYING - elif media_controller.is_paused: + elif self.media_status.player_is_paused: return STATE_PAUSED - elif media_controller.is_idle: + elif self.media_status.player_is_idle: return STATE_IDLE elif self.cast.is_idle: return STATE_OFF @@ -105,79 +110,85 @@ class CastDevice(MediaPlayerDevice): @property def volume_level(self): """ Volume level of the media player (0..1). """ - if self.cast_status is None: - return None - else: - return self.cast_status.volume_level + return self.cast_status.volume_level if self.cast_status else None @property def is_volume_muted(self): """ Boolean if volume is currently muted. """ - if self.cast_status is None: - return None - else: - return self.cast_status.volume_muted + return self.cast_status.volume_muted if self.cast_status else None @property def media_content_id(self): """ Content ID of current playing media. """ - if self.media_status is None: - return None - else: - return self.media_status.content_id + return self.media_status.content_id if self.media_status else None @property def media_content_type(self): """ Content type of current playing media. """ + if self.media_status is None: + return None + elif self.media_status.media_is_tvshow: + return MEDIA_TYPE_TVSHOW + elif self.media_status.media_is_movie: + return MEDIA_TYPE_VIDEO + elif self.media_status.media_is_musictrack: + return MEDIA_TYPE_MUSIC return None @property def media_duration(self): """ Duration of current playing media in seconds. """ - if self.media_status is None: - return None - else: - return self.media_status.duration + return self.media_status.duration if self.media_status else None @property def media_image_url(self): """ Image url of current playing media. """ - return self.cast.media_controller.thumbnail + if self.media_status is None: + return None + + images = self.media_status.images + + return images[0].url if images else None @property def media_title(self): """ Title of current playing media. """ - return self.cast.media_controller.title + return self.media_status.title if self.media_status else None @property def media_artist(self): """ Artist of current playing media. (Music track only) """ - return None + return self.media_status.artist if self.media_status else None @property def media_album(self): """ Album of current playing media. (Music track only) """ - return None + return self.media_status.album_name if self.media_status else None + + @property + def media_album_artist(self): + """ Album arist of current playing media. (Music track only) """ + return self.media_status.album_artist if self.media_status else None @property def media_track(self): """ Track number of current playing media. (Music track only) """ - return None + return self.media_status.track if self.media_status else None @property def media_series_title(self): """ Series title of current playing media. (TV Show only)""" - return None + return self.media_status.series_title if self.media_status else None @property def media_season(self): """ Season of current playing media. (TV Show only) """ - return None + return self.media_status.season if self.media_status else None @property def media_episode(self): """ Episode of current playing media. (TV Show only) """ - return None + return self.media_status.episode if self.media_status else None @property def app_id(self): @@ -192,14 +203,7 @@ class CastDevice(MediaPlayerDevice): @property def supported_media_commands(self): """ Flags of media commands that are supported. """ - return SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \ - SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PREVIOUS_TRACK | \ - SUPPORT_NEXT_TRACK - - @property - def device_state_attributes(self): - """ Extra attributes a device wants to expose. """ - return None + return SUPPORT_CAST def turn_on(self): """ Turns on the ChromeCast. """ @@ -211,11 +215,8 @@ class CastDevice(MediaPlayerDevice): self.cast.play_media( CAST_SPLASH, pychromecast.STREAM_TYPE_BUFFERED) - def turn_off(self): - """ Service to exit any running app on the specimedia player ChromeCast and - shows idle screen. Will quit all ChromeCasts if nothing specified. - """ + """ Turns Chromecast off. """ self.cast.quit_app() def mute_volume(self, mute): @@ -244,13 +245,13 @@ class CastDevice(MediaPlayerDevice): def media_seek(self, position): """ Seek the media to a specific location. """ - self.case.media_controller.seek(position) + self.cast.media_controller.seek(position) def play_youtube(self, media_id): """ Plays a YouTube media. """ self.youtube.play_video(media_id) - """implementation of chromecast status_listener methods""" + # implementation of chromecast status_listener methods def new_cast_status(self, status): """ Called when a new cast status is received. """ @@ -260,4 +261,4 @@ class CastDevice(MediaPlayerDevice): def new_media_status(self, status): """ Called when a new media status is received. """ self.media_status = status - self.update_ha_state() \ No newline at end of file + self.update_ha_state()