[gnome-music/wip/mschraal/core: 83/92] player: Use position for prev/next

[Marinus Schraal <mschraal src gnome org>]

commit bc6dbb66a85fdb8c5bcfa153d929b4d91c6d6496
Author: Marinus Schraal <mschraal gnome org>
Date:   Wed Jun 5 12:40:50 2019 +0200

    player: Use position for prev/next
    
    Instead of iterating.

 gnomemusic/player.py | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index ce6653fa..1a3d8aae 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -373,10 +373,8 @@ class PlayerPlaylist(GObject.GObject):
         :return: True if there is a song. False otherwise.
         :rtype: bool
         """
-        for idx, coresong in enumerate(self._model):
-            if coresong.props.media == self.props.current_song:
-                if idx < len(self._model) - 1:
-                    return True
+        if self.props.current_song_index < self._model.get_n_items() - 1:
+            return True
 
         return False
 
@@ -387,10 +385,9 @@ class PlayerPlaylist(GObject.GObject):
         :return: True if there is a song. False otherwise.
         :rtype: bool
         """
-        for idx, coresong in enumerate(self._model):
-            if coresong.props.media == self.props.current_song:
-                if idx > 0:
-                    return True
+        if (self.props.current_song_index <= self._model.get_n_items() - 1
+                and  self.props.current_song_index > 0):
+            return True
 
         return False
 
@@ -401,13 +398,17 @@ class PlayerPlaylist(GObject.GObject):
         :return: True if the operation succeeded. False otherwise.
         :rtype: bool
         """
-        for idx, coresong in enumerate(self._model):
-            if coresong.props.media == self.props.current_song:
-                coresong.props.state = SongWidget.State.PLAYED
-                self._model[idx+1].props.state = SongWidget.State.PLAYING
-                return True
+        if not self.has_next():
+            return False
 
-        return False
+        next_position = self.props.current_song_index + 1
+
+        self._model[self.props.current_song_index].props.state = SongWidget.State.PLAYED
+        self._model[next_position].props.state = SongWidget.State.PLAYING
+
+        self._current_index = next_position
+
+        return True
 
     @log
     def previous(self):
@@ -416,13 +417,17 @@ class PlayerPlaylist(GObject.GObject):
         :return: True if the operation succeeded. False otherwise.
         :rtype: bool
         """
-        for idx, coresong in enumerate(self._model):
-            if coresong.props.media == self.props.current_song:
-                coresong.props.state = SongWidget.State.PLAYED
-                self._model[idx-1].props.state = SongWidget.State.PLAYING
-                return True
+        if not self.has_previous():
+            return False
 
-        return False
+        previous_position = self.props.current_song_index - 1
+
+        self._model[self.props.current_song_index].props.state = SongWidget.State.PLAYED
+        self._model[previous_position].props.state = SongWidget.State.PLAYING
+
+        self._current_index = previous_position
+
+        return True
 
     @GObject.Property(type=int, default=0, flags=GObject.ParamFlags.READABLE)
     def current_song_index(self):