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

Proposed fixes to chromecast component

Browse Source
This commit is contained in:
Hans Bakker 2015-05-29 22:19:42 +02:00
parent 9d41958b3a
commit 3e01ce2a6c
3 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homeassistant/components/media_player/__init__.py
View File

@ -41,6 +41,7 @@ ATTR_MEDIA_DURATION = 'media_duration'
MEDIA_STATE_UNKNOWN = 'unknown' MEDIA_STATE_UNKNOWN = 'unknown'
MEDIA_STATE_PLAYING = 'playing' MEDIA_STATE_PLAYING = 'playing'
MEDIA_STATE_PAUSED = 'paused'
MEDIA_STATE_STOPPED = 'stopped' MEDIA_STATE_STOPPED = 'stopped'

100
homeassistant/components/media_player/cast.py
View File

@ -10,6 +10,7 @@ import logging
try: try:
import pychromecast import pychromecast
import pychromecast.controllers.youtube as youtube
except ImportError: except ImportError:
# We will throw error later # We will throw error later
pass pass
@ -18,7 +19,7 @@ from homeassistant.components.media_player import (
MediaPlayerDevice, STATE_NO_APP, ATTR_MEDIA_STATE, MediaPlayerDevice, STATE_NO_APP, ATTR_MEDIA_STATE,
ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_TITLE, ATTR_MEDIA_ARTIST, ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_TITLE, ATTR_MEDIA_ARTIST,
ATTR_MEDIA_ALBUM, ATTR_MEDIA_IMAGE_URL, ATTR_MEDIA_DURATION, ATTR_MEDIA_ALBUM, ATTR_MEDIA_IMAGE_URL, ATTR_MEDIA_DURATION,
ATTR_MEDIA_VOLUME, MEDIA_STATE_PLAYING, MEDIA_STATE_STOPPED) ATTR_MEDIA_VOLUME, MEDIA_STATE_PLAYING, MEDIA_STATE_PAUSED, MEDIA_STATE_STOPPED)
# pylint: disable=unused-argument # pylint: disable=unused-argument
@ -57,7 +58,9 @@ class CastDevice(MediaPlayerDevice):
""" Represents a Cast device on the network. """ """ Represents a Cast device on the network. """
def __init__(self, host): def __init__(self, host):
self.cast = pychromecast.PyChromecast(host) self.cast = pychromecast.Chromecast(host)
self.youtube = youtube.YouTubeController()
self.cast.register_handler(self.youtube)
@property @property
def name(self): def name(self):
@ -67,45 +70,52 @@ class CastDevice(MediaPlayerDevice):
@property @property
def state(self): def state(self):
""" Returns the state of the device. """ """ Returns the state of the device. """
status = self.cast.app status = self.cast.status
if status is None or status.app_id == pychromecast.APP_ID['HOME']: if self.cast.app_display_name:
return STATE_NO_APP return self.cast.app_display_name
else: else:
return status.description return STATE_NO_APP
@property @property
def state_attributes(self): def state_attributes(self):
""" Returns the state attributes. """ """ Returns the state attributes. """
ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP) mc = self.cast.media_controller;
if ramp and ramp.state != pychromecast.RAMP_STATE_UNKNOWN: if mc:
state_attr = {} state_attr = {}
if ramp.state == pychromecast.RAMP_STATE_PLAYING: if mc.is_playing:
state_attr[ATTR_MEDIA_STATE] = MEDIA_STATE_PLAYING state_attr[ATTR_MEDIA_STATE] = MEDIA_STATE_PLAYING
else: elif mc.is_paused:
state_attr[ATTR_MEDIA_STATE] = MEDIA_STATE_PAUSED
elif mc.is_idle:
state_attr[ATTR_MEDIA_STATE] = MEDIA_STATE_STOPPED state_attr[ATTR_MEDIA_STATE] = MEDIA_STATE_STOPPED
if ramp.content_id: media_status = self.cast.status
state_attr[ATTR_MEDIA_CONTENT_ID] = ramp.content_id
if ramp.title: if media_status:
state_attr[ATTR_MEDIA_TITLE] = ramp.title
if ramp.artist: """ These status properties seem not to be present anymore in pychromecast """
state_attr[ATTR_MEDIA_ARTIST] = ramp.artist #if ramp.content_id:
# state_attr[ATTR_MEDIA_CONTENT_ID] = mc.ramp.content_id
if ramp.album: #if ramp.title:
state_attr[ATTR_MEDIA_ALBUM] = ramp.album # state_attr[ATTR_MEDIA_TITLE] = ramp.title
if ramp.image_url: #if ramp.artist:
state_attr[ATTR_MEDIA_IMAGE_URL] = ramp.image_url # state_attr[ATTR_MEDIA_ARTIST] = ramp.artist
if ramp.duration: #if ramp.album:
state_attr[ATTR_MEDIA_DURATION] = ramp.duration # state_attr[ATTR_MEDIA_ALBUM] = ramp.album
state_attr[ATTR_MEDIA_VOLUME] = ramp.volume #if ramp.image_url:
# state_attr[ATTR_MEDIA_IMAGE_URL] = ramp.image_url
if hasattr(media_status, 'duration'):
state_attr[ATTR_MEDIA_DURATION] = media_status.duration
state_attr[ATTR_MEDIA_VOLUME] = media_status.volume_level
return state_attr return state_attr
@ -117,46 +127,38 @@ class CastDevice(MediaPlayerDevice):
def volume_up(self): def volume_up(self):
""" Service to send the chromecast the command for volume up. """ """ Service to send the chromecast the command for volume up. """
ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP) self.cast.volume_up()
if ramp:
ramp.volume_up()
def volume_down(self): def volume_down(self):
""" Service to send the chromecast the command for volume down. """ """ Service to send the chromecast the command for volume down. """
ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP) self.cast.volume_down()
if ramp:
ramp.volume_down()
def media_play_pause(self): def media_play_pause(self):
""" Service to send the chromecast the command for play/pause. """ """ Service to send the chromecast the command for play/pause. """
ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP) media_state = self.state_attributes[ATTR_MEDIA_STATE]
if media_state == MEDIA_STATE_STOPPED or media_state == MEDIA_STATE_PAUSED:
if ramp: self.media_pause()
ramp.playpause() elif media_state == MEDIA_STATE_PLAYING:
self.media_play()
def media_play(self): def media_play(self):
""" Service to send the chromecast the command for play/pause. """ """ Service to send the chromecast the command for play/pause. """
ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP) if self.state_attributes[ATTR_MEDIA_STATE] == MEDIA_STATE_STOPPED:
self.media_play_pause()
if ramp and ramp.state == pychromecast.RAMP_STATE_STOPPED:
ramp.playpause()
def media_pause(self): def media_pause(self):
""" Service to send the chromecast the command for play/pause. """ """ Service to send the chromecast the command for play/pause. """
ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP) if self.state_attributes[ATTR_MEDIA_STATE] == MEDIA_STATE_PLAYING:
self.media_play_pause()
if ramp and ramp.state == pychromecast.RAMP_STATE_PLAYING: """ This one seems not to be present anymore in pychromecast, needs porting or cleanup """
ramp.playpause() #def media_next_track(self):
# """ Service to send the chromecast the command for next track. """
# ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP)
def media_next_track(self): # if ramp:
""" Service to send the chromecast the command for next track. """ # ramp.next()
ramp = self.cast.get_protocol(pychromecast.PROTOCOL_RAMP)
if ramp:
ramp.next()
def play_youtube_video(self, video_id): def play_youtube_video(self, video_id):
""" Plays specified video_id on the Chromecast's YouTube channel. """ """ Plays specified video_id on the Chromecast's YouTube channel. """
pychromecast.play_youtube_video(video_id, self.cast.host) self.youtube.play_video(video_id)

2
requirements.txt
View File

@ -18,7 +18,7 @@ phue>=0.8
ledcontroller>=1.0.7 ledcontroller>=1.0.7
# media_player.cast # media_player.cast
pychromecast>=0.5 pychromecast>=0.6
# keyboard # keyboard
pyuserinput>=0.1.9 pyuserinput>=0.1.9