[gnome-music/wip/jfelder/mpris-cleanup: 100/117] mpris: Group MPRIS playlist creation logic into one method



commit f7ebf95c1e459142136ab233385136c072c5b786
Author: Jean Felder <jfelder src gnome org>
Date:   Thu Apr 4 14:08:37 2019 +0200

    mpris: Group MPRIS playlist creation logic into one method
    
    MPRIS playlists are a data structure describing a playlist. It
    consists of a unique identifier (path), a name, and an icon.
    In GNOME Music case, icon are always empty.

 gnomemusic/mpris.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py
index 3e39afa0..bffa72f0 100644
--- a/gnomemusic/mpris.py
+++ b/gnomemusic/mpris.py
@@ -405,6 +405,12 @@ class MPRIS(DBusInterface):
                 return playlist
         return None
 
+    @log
+    def _get_mpris_playlist_from_playlist(self, playlist):
+        playlist_name = utils.get_media_title(playlist)
+        path = self._get_playlist_dbus_path(playlist)
+        return (path, playlist_name, "")
+
     @log
     def _get_playlist_from_id(self, playlist_id):
         for playlist in self._stored_playlists:
@@ -441,9 +447,8 @@ class MPRIS(DBusInterface):
             return (False, ("/", "", ""))
 
         playlist = self._get_playlist_from_id(self.player.get_playlist_id())
-        playlist_name = utils.get_media_title(playlist)
-        path = self._get_playlist_dbus_path(playlist)
-        return (True, (path, playlist_name, ""))
+        mpris_playlist = self._get_mpris_playlist_from_playlist(playlist)
+        return (True, mpris_playlist)
 
     @log
     def _on_current_song_changed(self, player):
@@ -673,17 +678,16 @@ class MPRIS(DBusInterface):
         if order != 'Alphabetical':
             return []
 
-        playlists = [(self._get_playlist_dbus_path(playlist),
-                      utils.get_media_title(playlist), '')
-                     for playlist in self._stored_playlists]
+        mpris_playlists = [self._get_mpris_playlist_from_playlist(playlist)
+                           for playlist in self._stored_playlists]
 
         if not reverse:
-            return playlists[index:index + max_count]
+            return mpris_playlists[index:index + max_count]
 
         first_index = index - 1
         if first_index < 0:
             first_index = None
-        return playlists[index + max_count - 1:first_index:-1]
+        return mpris_playlists[index + max_count - 1:first_index:-1]
 
     def PlaylistChanged(self, playlist):
         self.con.emit_signal(None,


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