jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-25 01:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid key errors

Browse Source
This commit is contained in:
Jon Maddox 2015-10-07 00:56:14 -04:00
parent ad549be353
commit 6afb846d04
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,8 +287,8 @@ def setup(hass, config):
def play_media_service(service):
""" Plays specified media_id on the media player. """
media_type = service.data['media_type']
media_id = service.data['media_id']
media_type = service.data.get('media_type')
media_id = service.data.get('media_id')
if media_type is None:
return

3
homeassistant/helpers/state.py
View File

@ -63,7 +63,8 @@ def reproduce_state(hass, states, blocking=False):
service = SERVICE_MEDIA_PAUSE
elif state.domain == 'media_player' and state.state == STATE_PLAYING:
service = SERVICE_MEDIA_PLAY
elif state.domain == 'media_player' and state.attributes and state.attributes['media_type'] and state.attributes['media_id']:
elif state.domain == 'media_player' and state.attributes and
'media_type' in state.attributes and 'media_id' in state.attributes
service = SERVICE_PLAY_MEDIA
elif state.state == STATE_ON:
service = SERVICE_TURN_ON