Merge branch 'dev' into itunes-play-media

homeassistant/components/media_player/__init__.py

@@ -190,6 +190,16 @@ def media_previous_track(hass, entity_id=None):
     hass.services.call(DOMAIN, SERVICE_MEDIA_PREVIOUS_TRACK, data)
 
 
+def play_media(hass, media_type, media_id, entity_id=None):
+    """ Send the media player the command for playing media. """
+    data = {"media_type": media_type, "media_id": media_id}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    hass.services.call(DOMAIN, SERVICE_PLAY_MEDIA, data)
+
+
 def setup(hass, config):
     """ Track states and offer events for media_players. """
     component = EntityComponent(
@@ -287,8 +297,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

homeassistant/components/media_player/cast.py

@@ -90,6 +90,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class CastDevice(MediaPlayerDevice):
     """ Represents a Cast device on the network. """
 
+    # pylint: disable=abstract-method
     # pylint: disable=too-many-public-methods
 
     def __init__(self, host):

homeassistant/helpers/state.py

@@ -13,6 +13,8 @@ from homeassistant.const import (
     SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PAUSE,
     STATE_PLAYING, STATE_PAUSED, ATTR_ENTITY_ID)
 
+from homeassistant.components.media_player import (SERVICE_PLAY_MEDIA)
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -61,6 +63,10 @@ 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 \
+            'media_type' in state.attributes and \
+                'media_id' in state.attributes:
+            service = SERVICE_PLAY_MEDIA
         elif state.state == STATE_ON:
             service = SERVICE_TURN_ON
         elif state.state == STATE_OFF:

tests/components/test_media_player.py

@@ -40,7 +40,7 @@ class TestMediaPlayer(unittest.TestCase):
 
     def test_services(self):
         """
-        Test if the call service methods conver to correct service calls.
+        Test if the call service methods convert to correct service calls.
         """
         services = {
             SERVICE_TURN_ON: media_player.turn_on,