[gnome-music/wip/jfelder/reorder-searchview-model: 2/2] player: Remove obsolete discovery_status_field attribute

[Jean Felder <jfelder src gnome org>]

commit e55be910ce57ea5256d4455c8cdcfab6302288c8
Author: Jean Felder <jean felder gmail com>
Date:   Sun Feb 18 00:48:15 2018 +0100

    player: Remove obsolete discovery_status_field attribute
    
    This is now equal to 11 for all views.

 gnomemusic/player.py                    | 14 +++++---------
 gnomemusic/views/playlistview.py        |  9 ++++-----
 gnomemusic/views/songsview.py           |  2 +-
 gnomemusic/widgets/albumwidget.py       |  2 +-
 gnomemusic/widgets/artistalbumwidget.py |  2 +-
 5 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 5432377..2ce513e 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -330,7 +330,7 @@ class Player(GObject.GObject):
         if media is not None:
             if self.currentTrack and self.currentTrack.valid():
                 currentTrack = self.playlist.get_iter(self.currentTrack.get_path())
-                self.playlist.set_value(currentTrack, self.discovery_status_field, DiscoveryStatus.FAILED)
+                self.playlist.set_value(currentTrack, 11, DiscoveryStatus.FAILED)
             uri = media.get_url()
         else:
             uri = 'none'
@@ -601,7 +601,7 @@ class Player(GObject.GObject):
     def _on_next_item_validated(self, info, error, _iter):
         if error:
             print("Info %s: error: %s" % (info, error))
-            self.playlist.set_value(_iter, self.discovery_status_field, DiscoveryStatus.FAILED)
+            self.playlist.set_value(_iter, 11, DiscoveryStatus.FAILED)
             nextTrack = self.playlist.iter_next(_iter)
 
             if nextTrack:
@@ -618,7 +618,7 @@ class Player(GObject.GObject):
             return
 
         _iter = self.playlist.get_iter(self.nextTrack.get_path())
-        status = self.playlist.get_value(_iter, self.discovery_status_field)
+        status = self.playlist.get_value(_iter, 11)
         nextSong = self.playlist.get_value(_iter, self.playlistField)
         url = self.playlist.get_value(_iter, 5).get_url()
 
@@ -722,11 +722,8 @@ class Player(GObject.GObject):
         else:
             self.set_playing(True)
 
-    # FIXME: set the discovery field to 11 to be safe, but for some
-    # models it is 12.
     @log
-    def set_playlist(self, type, id, model, iter, field,
-                     discovery_status_field=11):
+    def set_playlist(self, type, id, model, iter, field):
         old_playlist = self.playlist
         if old_playlist != model:
             self.playlist = model
@@ -742,7 +739,6 @@ class Player(GObject.GObject):
             self.currentTrackUri = self.playlist.get_value(
                 self.playlist.get_iter(self.currentTrack.get_path()), 5).get_url()
         self.playlistField = field
-        self.discovery_status_field = discovery_status_field
 
         if old_playlist != model:
             self.playlist_insert_handler = model.connect('row-inserted', self._on_playlist_size_changed)
@@ -1058,7 +1054,7 @@ class Player(GObject.GObject):
         if not self.currentTrack or not self.currentTrack.valid():
             return None
         currentTrack = self.playlist.get_iter(self.currentTrack.get_path())
-        if self.playlist.get_value(currentTrack, self.discovery_status_field) == DiscoveryStatus.FAILED:
+        if self.playlist.get_value(currentTrack, 11) == DiscoveryStatus.FAILED:
             return None
         return self.playlist.get_value(currentTrack, self.playlistField)
 
diff --git a/gnomemusic/views/playlistview.py b/gnomemusic/views/playlistview.py
index 7aa78bf..89c343c 100644
--- a/gnomemusic/views/playlistview.py
+++ b/gnomemusic/views/playlistview.py
@@ -349,7 +349,7 @@ class PlaylistView(BaseView):
             if self.model[_iter][8] != self._error_icon_name:
                 self.player.set_playlist(
                     'Playlist', self._current_playlist.get_id(), self.model,
-                    _iter, 5, 11)
+                    _iter, 5)
                 self.player.set_playing(True)
 
         # 'row-activated' signal is emitted before 'drag-begin' signal.
@@ -417,7 +417,7 @@ class PlaylistView(BaseView):
             self._iter_to_clean = new_iter
             self.player.set_playlist(
                 'Playlist', self._current_playlist.get_id(), self.model,
-                new_iter, 5, 11)
+                new_iter, 5)
 
         first_pos = min(new_pos, prev_pos)
         last_pos = max(new_pos, prev_pos)
@@ -816,7 +816,7 @@ class PlaylistView(BaseView):
                     self._iter_to_clean = None
                     self._update_model(self.player, model, next_iter)
                     self.player.set_playlist('Playlist', playlist.get_id(),
-                                             model, next_iter, 5, 11)
+                                             model, next_iter, 5)
                     self.player.set_playing(True)
 
                 # Update songs count
@@ -836,8 +836,7 @@ class PlaylistView(BaseView):
                         and self._row_is_playing(playlist, row)):
                     self._iter_to_clean = row.iter
                     self.player.set_playlist(
-                        'Playlist', playlist.get_id(), self.model, row.iter, 5,
-                        11)
+                        'Playlist', playlist.get_id(), self.model, row.iter, 5)
                     return
 
     @log
diff --git a/gnomemusic/views/songsview.py b/gnomemusic/views/songsview.py
index e52a87d..742682a 100644
--- a/gnomemusic/views/songsview.py
+++ b/gnomemusic/views/songsview.py
@@ -94,7 +94,7 @@ class SongsView(BaseView):
             return
 
         if self.model[itr][8] != self._error_icon_name:
-            self.player.set_playlist('Songs', None, self.model, itr, 5, 11)
+            self.player.set_playlist('Songs', None, self.model, itr, 5)
             self.player.set_playing(True)
 
     @log
diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py
index 97aaaa1..9f32c52 100644
--- a/gnomemusic/widgets/albumwidget.py
+++ b/gnomemusic/widgets/albumwidget.py
@@ -243,7 +243,7 @@ class AlbumWidget(Gtk.EventBox):
 
         self._player.stop()
         self._player.set_playlist('Album', self._album, song_widget.model,
-                                  song_widget.itr, 5, 11)
+                                  song_widget.itr, 5)
         self._player.set_playing(True)
         return True
 
diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py
index c26af1e..6f2d105 100644
--- a/gnomemusic/widgets/artistalbumwidget.py
+++ b/gnomemusic/widgets/artistalbumwidget.py
@@ -164,7 +164,7 @@ class ArtistAlbumWidget(Gtk.Box):
 
         self._player.stop()
         self._player.set_playlist('Artist', self._artist, song_widget.model,
-                                  song_widget.itr, 5, 11)
+                                  song_widget.itr, 5)
         self._player.set_playing(True)
 
         return True