[gnome-music] playlistview: Refactor current playlist check
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music] playlistview: Refactor current playlist check
- Date: Sun, 4 Feb 2018 23:40:34 +0000 (UTC)
commit b44df6b56aed43d6fe301f81a4ad6683e15ded93
Author: Jean Felder <jean felder gmail com>
Date: Sun Jan 28 17:30:21 2018 +0100
playlistview: Refactor current playlist check
gnomemusic/views/playlistview.py | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/gnomemusic/views/playlistview.py b/gnomemusic/views/playlistview.py
index 5eda4ab..af57942 100644
--- a/gnomemusic/views/playlistview.py
+++ b/gnomemusic/views/playlistview.py
@@ -405,7 +405,7 @@ class PlaylistView(BaseView):
for row in self._sidebar:
playlist = row.playlist
if (str(playlist_id) == playlist.get_id()
- and self.current_playlist == playlist):
+ and self._is_current_playlist(playlist)):
GLib.idle_add(self._on_playlist_activated, self._sidebar, row)
break
@@ -553,6 +553,14 @@ class PlaylistView(BaseView):
else:
return False
+ @log
+ def _is_current_playlist(self, playlist):
+ """Check if playlist is currently displayed"""
+ if (self.current_playlist
+ and playlist.get_id() == self.current_playlist.get_id()):
+ return True
+ return False
+
@log
def _stage_playlist_for_deletion(self):
self.model.clear()
@@ -628,22 +636,19 @@ class PlaylistView(BaseView):
@log
def _on_song_added_to_playlist(self, playlists, playlist, item):
- if (self.current_playlist
- and playlist.get_id() == self.current_playlist.get_id()):
+ if self._is_current_playlist(playlist):
self._add_song_to_model(item, self.model)
@log
def _on_song_removed_from_playlist(self, playlists, playlist, item):
- if (self.current_playlist
- and playlist.get_id() == self.current_playlist.get_id()):
+ if self._is_current_playlist(playlist):
model = self.model
else:
return
# checks if the to be removed track is now being played
def is_playing(row):
- if (self.current_playlist
- and playlist.get_id() == self.current_playlist.get_id()):
+ if self._is_current_playlist(playlist):
if (self.player.currentTrack is not None
and self.player.currentTrack.valid()):
track_path = self.player.currentTrack.get_path()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]