[gnome-music/wip/jfelder/current-playlist] playlistview: Simplify _undo_pending_deletion logic



commit 427f4832719f5cc0bb9ba16a9946a97eb83c2b16
Author: Jean Felder <jfelder src gnome org>
Date:   Mon May 13 22:29:54 2019 +0200

    playlistview: Simplify _undo_pending_deletion logic
    
    Limit the number of indentation.

 gnomemusic/views/playlistview.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/gnomemusic/views/playlistview.py b/gnomemusic/views/playlistview.py
index 1e6742ba..1e05a549 100644
--- a/gnomemusic/views/playlistview.py
+++ b/gnomemusic/views/playlistview.py
@@ -690,18 +690,20 @@ class PlaylistView(BaseView):
 
         else:
             song_todelete = self._songs_todelete[media_id]
-            playlist = song_todelete['playlist']
-            if (self._current_playlist
-                    and playlist.get_id() == self._current_playlist.get_id()):
-                iter_ = self._add_song_to_model(
-                    song_todelete['song'], self.model, song_todelete['index'])
-                playlist_id = self._current_playlist.get_id()
-                if self.player.playing_playlist(
-                        PlayerPlaylist.Type.PLAYLIST, playlist_id):
-                    song = self.model[iter_][5]
-                    path = self.model.get_path(iter_)
-                    self.player.add_song(song, int(path.to_string()))
             self._songs_todelete.pop(media_id)
+            if not self._is_current_playlist(song_todelete['playlist']):
+                return
+
+            iter_ = self._add_song_to_model(
+                song_todelete['song'], self.model, song_todelete['index'])
+
+            playlist_id = self._current_playlist.get_id()
+            if not self.player.playing_playlist(
+                    PlayerPlaylist.Type.PLAYLIST, playlist_id):
+                return
+
+            path = self.model.get_path(iter_)
+            self.player.add_song(self.model[iter_][5], int(path.to_string()))
 
     @log
     def _finish_pending_deletion(self, playlist_notification):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]