From 4f2435103bf24bd5b158769811947135d99fbaaf Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Wed, 3 Apr 2019 04:58:02 +0200
Subject: [PATCH] Cast: Fix next/previous track (#22634)

* Fix next/previous track

* Bump pychromecast

* Update test, fixup
---
 homeassistant/components/cast/__init__.py     |  2 +-
 homeassistant/components/cast/media_player.py | 27 +++++++++++++------
 requirements_all.txt                          |  2 +-
 tests/components/cast/test_media_player.py    |  8 +++---
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/cast/__init__.py b/homeassistant/components/cast/__init__.py
index 1aea4655e17..0ec3ac150d7 100644
--- a/homeassistant/components/cast/__init__.py
+++ b/homeassistant/components/cast/__init__.py
@@ -2,7 +2,7 @@
 from homeassistant import config_entries
 from homeassistant.helpers import config_entry_flow
 
-REQUIREMENTS = ['pychromecast==3.1.0']
+REQUIREMENTS = ['pychromecast==3.2.0']
 
 DOMAIN = 'cast'
 
diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py
index cb60cdc2967..2635a061e60 100644
--- a/homeassistant/components/cast/media_player.py
+++ b/homeassistant/components/cast/media_player.py
@@ -12,8 +12,8 @@ from homeassistant.components.media_player import (
 from homeassistant.components.media_player.const import (
     MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, SUPPORT_NEXT_TRACK,
     SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE,
-    SUPPORT_VOLUME_SET)
+    SUPPORT_SEEK, SUPPORT_STOP, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET)
 from homeassistant.const import (
     CONF_HOST, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF, STATE_PAUSED,
     STATE_PLAYING)
@@ -36,9 +36,9 @@ CAST_SPLASH = 'https://home-assistant.io/images/cast/splash.png'
 
 DEFAULT_PORT = 8009
 
-SUPPORT_CAST = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
-    SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PREVIOUS_TRACK | \
-    SUPPORT_NEXT_TRACK | SUPPORT_PLAY_MEDIA | SUPPORT_STOP | SUPPORT_PLAY
+SUPPORT_CAST = SUPPORT_PAUSE | SUPPORT_PLAY | SUPPORT_PLAY_MEDIA | \
+               SUPPORT_STOP | SUPPORT_TURN_OFF | SUPPORT_TURN_ON | \
+               SUPPORT_VOLUME_MUTE | SUPPORT_VOLUME_SET
 
 # Stores a threading.Lock that is held by the internal pychromecast discovery.
 INTERNAL_DISCOVERY_RUNNING_KEY = 'cast_discovery_running'
@@ -931,12 +931,12 @@ class CastDevice(MediaPlayerDevice):
     def media_previous_track(self):
         """Send previous track command."""
         media_controller = self._media_controller()
-        media_controller.rewind()
+        media_controller.queue_prev()
 
     def media_next_track(self):
         """Send next track command."""
         media_controller = self._media_controller()
-        media_controller.skip()
+        media_controller.queue_next()
 
     def media_seek(self, position):
         """Seek the media to a specific location."""
@@ -1130,7 +1130,18 @@ class CastDevice(MediaPlayerDevice):
     @property
     def supported_features(self):
         """Flag media player features that are supported."""
-        return SUPPORT_CAST
+        support = SUPPORT_CAST
+        media_status, _ = self._media_status()
+
+        if media_status:
+            if media_status.supports_queue_next:
+                support |= SUPPORT_PREVIOUS_TRACK
+            if media_status.supports_queue_next:
+                support |= SUPPORT_NEXT_TRACK
+            if media_status.supports_seek:
+                support |= SUPPORT_SEEK
+
+        return support
 
     @property
     def media_position(self):
diff --git a/requirements_all.txt b/requirements_all.txt
index a6f0e055c9a..6d136a11fb1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -980,7 +980,7 @@ pycfdns==0.0.1
 pychannels==1.0.0
 
 # homeassistant.components.cast
-pychromecast==3.1.0
+pychromecast==3.2.0
 
 # homeassistant.components.cmus.media_player
 pycmus==0.1.1
diff --git a/tests/components/cast/test_media_player.py b/tests/components/cast/test_media_player.py
index 7c40b09d03e..e7418460c59 100644
--- a/tests/components/cast/test_media_player.py
+++ b/tests/components/cast/test_media_player.py
@@ -479,16 +479,16 @@ async def test_dynamic_group_media_control(hass: HomeAssistantType):
     group_media_status.player_is_playing = True
     entity.new_dynamic_group_media_status(group_media_status)
     entity.media_previous_track()
-    assert entity._dynamic_group_cast.media_controller.rewind.called
-    assert not chromecast.media_controller.rewind.called
+    assert entity._dynamic_group_cast.media_controller.queue_prev.called
+    assert not chromecast.media_controller.queue_prev.called
 
     # Player is paused, dynamic group is playing -> Should not forward
     player_media_status.player_is_playing = False
     player_media_status.player_is_paused = True
     entity.new_media_status(player_media_status)
     entity.media_next_track()
-    assert not entity._dynamic_group_cast.media_controller.skip.called
-    assert chromecast.media_controller.skip.called
+    assert not entity._dynamic_group_cast.media_controller.queue_next.called
+    assert chromecast.media_controller.queue_next.called
 
     # Player is in unknown state, dynamic group is playing -> Should forward
     player_media_status.player_state = "UNKNOWN"