Merge pull request #1534 from edran/fix-scrobbling

Get correct track position on change events

docs/changelog.rst

@@ -42,7 +42,12 @@ Bug fix release.
   remains unimplemented. (PR: :issue:`1520`)
 
 - MPD: Add ``nextsong`` and ``nextsongid`` to the response of MPD ``status`` command.
-  (Fixes: :issue:`1133` :issue:`1516`, PR: :issue:`1523`)
+  (Fixes: :issue:`1133`, :issue:`1516`, PR: :issue:`1523`)
+
+- Core: Correctly record the last position of a track when switching to another
+  one. Particularly relevant for `mopidy-scrobbler` users, as before it was
+  essentially unusable. (Fixes: :issue:`1456`, PR: :issue:`1534`)
+
 
 v2.0.0 (2016-02-15)
 ===================

mopidy/core/playback.py

@@ -251,6 +251,12 @@ def _on_about_to_finish(self):
         if self._state == PlaybackState.STOPPED:
             return
 
+        # Unless overridden by other calls (e.g. next / previous / stop) this
+        # will be the last position recorded until the track gets reassigned.
+        # TODO: Check if case when track.length isn't populated needs to be
+        # handled.
+        self._last_position = self._current_tl_track.track.length
+
         pending = self.core.tracklist.eot_track(self._current_tl_track)
         # avoid endless loop if 'repeat' is 'true' and no track is playable
         # * 2 -> second run to get all playable track in a shuffled playlist
@@ -394,6 +400,10 @@ def _change(self, pending_tl_track, state):
         if not backend:
             return False
 
+        # This must happen before prepare_change gets called, otherwise the
+        # backend flushes the information of the track.
+        self._last_position = self.get_time_position()
+
         # TODO: Wrap backend call in error handling.
         backend.playback.prepare_change()