fix/play_from_gui

ovos_plugin_common_play/ocp/gui.py

@@ -8,7 +8,7 @@
 from ovos_config import Configuration
 from ovos_utils.events import EventSchedulerInterface
 from ovos_utils.log import LOG
-from ovos_workshop.decorators.ocp import MediaType, PlayerState, LoopState, PlaybackType
+from ovos_workshop.backwards_compat import MediaType, Playlist, MediaEntry, PlayerState, LoopState, PlaybackType, PluginStream, dict2entry
 
 from ovos_plugin_common_play.ocp.constants import OCP_ID
 from ovos_plugin_common_play.ocp.utils import is_qtav_available
@@ -363,25 +363,61 @@ def _show_suggestion_disambiguation(self):
         self.send_event("ocp.gui.show.suggestion.view.disambiguation")
 
     # gui <-> playlists
+    def _gui2entry(self, gui_entry, from_playlist=True, from_search=True):
+        if isinstance(gui_entry, dict):
+            gui_entry = dict2entry(gui_entry)
+        # HACK: since the GUI sends incomplete data,
+        # we need to check the internal playlist....
+        if from_playlist:
+            for track in self.player.playlist:
+                if isinstance(gui_entry, Playlist):
+                    if not isinstance(track, Playlist):
+                        continue
+                    if track.title == gui_entry.title:
+                        LOG.debug(f"gui data mapped to {track}")
+                        return track
+
+                elif not isinstance(track, Playlist):
+                    if isinstance(track, PluginStream):
+                        uri = f"{track.extractor_id}//{track.stream}"
+                    else:
+                        uri = track.uri
+                    if uri == gui_entry.uri:
+                        LOG.debug(f"gui data mapped to {track}")
+                        return track
+        if from_search:
+            for track in self.player.disambiguation:
+                if isinstance(gui_entry, Playlist):
+                    if not isinstance(track, Playlist):
+                        continue
+                    if track.title == gui_entry.title:
+                        LOG.debug(f"gui data mapped to {track}")
+                        return track
+
+                elif not isinstance(track, Playlist):
+                    if isinstance(track, PluginStream):
+                        uri = f"{track.extractor_id}//{track.stream}"
+                    else:
+                        uri = track.uri
+                    if uri == gui_entry.uri:
+                        LOG.debug(f"gui data mapped to {track}")
+                        return track
+        LOG.warning("malformed GUI request, track not in search results")
+        if gui_entry.playback == PlaybackType.UNDEFINED:
+            LOG.error("undefined playback type, assuming PlaybackType.AUDIO_SERVICE")
+            gui_entry.playback = PlaybackType.AUDIO_SERVICE
+        # either GUI issues got fixed or an error will be spoken
+        return gui_entry
+
     def handle_play_from_playlist(self, message):
         LOG.debug("Playback requested from playlist results")
-        media = message.data["playlistData"]
-        for track in self.player.playlist:
-            if track == media:  # found track
-                self.player.play_media(track)
-                break
-        else:
-            LOG.error("Track is not part of loaded playlist!")
+        media = self._gui2entry(message.data["playlistData"], from_playlist=True, from_search=False)
+        self.player.play_media(media)
 
     def handle_play_from_search(self, message):
         LOG.debug("Playback requested from search results")
-        media = message.data["playlistData"]
-        for track in self.player.disambiguation:
-            if track == media:  # found track
-                self.player.play_media(track)
-                break
-        else:
-            LOG.error("Track is not part of search results!")
+        media = self._gui2entry(message.data["playlistData"], from_playlist=False, from_search=True)
+        self.player.play_media(media)
 
     def handle_play_skill_featured_media(self, message):
         skill_id = message.data["skill_id"]