audioservice track info

mycroft/audio/audioservice.py

@@ -237,6 +237,10 @@ def _next(self, message=None):
                 message: message bus message, not used but required
         """
         if self.current:
+            if self.current.index + 1 > len(self.current.tracks):
+                self.current.index = 0
+            else:
+                self.current.index += 1
             self.current.next()
 
     def _prev(self, message=None):
@@ -248,6 +252,10 @@ def _prev(self, message=None):
                 message: message bus message, not used but required
         """
         if self.current:
+            if self.current.index - 1 < 0:
+                self.current.index = 0
+            else:
+                self.current.index -= 1
             self.current.previous()
 
     def _stop(self, message=None):

mycroft/audio/services/__init__.py

@@ -30,14 +30,23 @@ def __init__(self, config, bus):
         self.bus = bus
         self.config = config
         self.index = 0
+        self.tracks = []
         self.track_data = {}
         self.bus.on('play:status', self.handle_track_status)
 
     def handle_track_status(self, message):
         index = message.data.get("playlist_position")
-        if index < 0:
+        uri = message.data.get("uri")
+        if index is None and uri:
+            for idx in self.track_data:
+                if self.track_data[idx].get("uri", "") == uri:
+                    index = idx
+                    break
+        elif index is None:
             index = len(self.track_data) - 1
-        self.track_data[index] = message.data
+        for k in message.data:
+            if message.data[k]:
+                self.track_data[index][k] = message.data[k]
 
     @abstractmethod
     def supported_uris(self):
@@ -105,13 +114,15 @@ def next(self):
         """
             Skip to next track in playlist.
         """
-        pass
+        # play index + 1
+        self.play()
 
     def previous(self):
         """
             Skip to previous track in playlist.
         """
-        pass
+        # play index - 1
+        self.play()
 
     def lower_volume(self):
         """
@@ -151,7 +162,7 @@ def track_info(self):
                 Dict with track info.
         """
         if self.index not in self.track_data:
-            return None
+            return {}
         return self.track_data[self.index]
 
     def shutdown(self):

mycroft/audio/services/chromecast/__init__.py

@@ -135,19 +135,6 @@ def restore_volume(self):
         # self.cast.volume_up()
         pass
 
-    def track_info(self):
-        """ Return info about currently playing track. """
-        info = {}
-        ret = {}
-        ret['name'] = info.get('name', '')
-        if 'album' in info:
-            ret['artist'] = info['album']['artists'][0]['name']
-            ret['album'] = info['album'].get('name', '')
-        else:
-            ret['artist'] = ''
-            ret['album'] = ''
-        return ret
-
     def shutdown(self):
         """ Disconnect from the device. """
         self.cast.disconnect()

mycroft/audio/services/mopidy/__init__.py

@@ -112,13 +112,13 @@ def restore_volume(self):
     def track_info(self):
         info = self.mopidy.currently_playing()
         ret = {}
-        ret['name'] = info.get('name', '')
-        if 'album' in info:
+        if self.index in self.track_data:
+            ret = self.track_data[self.index]
+        if "track" not in ret:
+            ret['track'] = info.get('name', '')
+        if "album" not in ret and 'album' in info:
             ret['artist'] = info['album']['artists'][0]['name']
             ret['album'] = info['album'].get('name', '')
-        else:
-            ret['artist'] = ''
-            ret['album'] = ''
         return ret
 
 

mycroft/audio/services/mplayer/__init__.py

@@ -52,11 +52,8 @@ def play(self, repeat=False):
         """
         self.stop()
         if len(self.tracks):
-            # play first track
-            self.mpc.loadfile(self.tracks[0])
-            # add other tracks
-            for track in self.tracks[1:]:
-                self.mpc.loadfile(track, 1)
+            # play self.index track
+            self.mpc.loadfile(self.tracks[self.index])
 
     def stop(self):
         self.mpc.stop()
@@ -71,16 +68,12 @@ def resume(self):
             self.mpc.pause()
 
     def next(self):
-        self.index += 1
-        if self.index > len(self.tracks):
-            self.index = 0
-            self.play()
+        # just play next self.index
+        self.play()
 
     def previous(self):
-        self.index -= 1
-        if self.index < 0:
-            self.index = 0
-            self.play()
+        # just play previous self.index
+        self.play()
 
     def lower_volume(self):
         if self.normal_volume is None:
@@ -102,13 +95,22 @@ def track_info(self):
                 Dict with track info.
         """
         ret = {}
-        ret['title'] = self.mpc.get_meta_title()
-        ret['artist'] = self.mpc.get_meta_artist()
-        ret['album'] = self.mpc.get_meta_album()
-        ret['genre'] = self.mpc.get_meta_genre()
-        ret['year'] = self.mpc.get_meta_year()
-        ret['track'] = self.mpc.get_meta_track()
-        ret['comment'] = self.mpc.get_meta_comment()
+        if self.index in self.track_data:
+            ret = self.track_data[self.index]
+        if "title" not in ret:
+            ret['title'] = self.mpc.get_meta_title()
+        if "artist" not in ret:
+            ret['artist'] = self.mpc.get_meta_artist()
+        if "album" not in ret:
+            ret['album'] = self.mpc.get_meta_album()
+        if "genre" not in ret:
+            ret['genre'] = self.mpc.get_meta_genre()
+        if "year" not in ret:
+            ret['year'] = self.mpc.get_meta_year()
+        if "track" not in ret:
+            ret['track'] = self.mpc.get_meta_track()
+        if "comment" not in ret:
+            ret['comment'] = self.mpc.get_meta_comment()
         return ret
 
     def shutdown(self):

mycroft/audio/services/vlc/__init__.py

@@ -95,13 +95,10 @@ def resume(self):
     def next(self):
         """ Skip to next track in playlist. """
         self.list_player.next()
-        self.index += 1
 
     def previous(self):
         """ Skip to previous track in playlist. """
         self.list_player.previous()
-        if self.index > 0:
-            self.index -= 1
 
     def lower_volume(self):
         """ Lower volume (will be called when mycroft is listening

mycroft/skills/common_play_skill.py

@@ -179,6 +179,8 @@ def CPS_play(self, *args, **kwargs):
         if 'utterance' not in kwargs:
             kwargs['utterance'] = self.play_service_string
         self.audioservice.play(*args, **kwargs)
+        self.CPS_send_status(uri=args[0],
+                             status=CPSTrackStatus.PLAYING_AUDIOSERVICE)
 
     def stop(self):
         """Stop anything playing on the audioservice."""
@@ -234,9 +236,9 @@ def CPS_start(self, phrase, data):
         # self.CPS_play("http://zoosh.com/stream_music")
         pass
 
-    def CPS_send_status(self, artist='', track='', album='', image='',
+    def CPS_send_status(self, uri="", artist='', track='', album='', image='',
                         track_length="", current_position="",
-                        playlist_position=-1,
+                        playlist_position=None,
                         status=CPSTrackStatus.DISAMBIGUATION, **kwargs):
         """Inform system of playback status.
 
@@ -255,6 +257,7 @@ def CPS_send_status(self, artist='', track='', album='', image='',
             image (str): url for image to show
         """
         data = {'skill': self.name,
+                "uri": uri,
                 'artist': artist,
                 'album': album,
                 'track': track,