[gnome-music/wip/jfelder/mpris-limit-get-songs: 3/12] mpris: Simplify _get_active_playlist logic
- From: Jean Felder <jfelder src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/jfelder/mpris-limit-get-songs: 3/12] mpris: Simplify _get_active_playlist logic
- Date: Fri, 26 Oct 2018 22:33:17 +0000 (UTC)
commit 630e5b2e998bcf35bfd228ae3fc38f0c4e2137fc
Author: Jean Felder <jfelder src gnome org>
Date: Tue Oct 23 19:26:44 2018 +0200
mpris: Simplify _get_active_playlist logic
Also add a docstring to describe its purpose.
gnomemusic/mpris.py | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py
index 4171f524..82468cd1 100644
--- a/gnomemusic/mpris.py
+++ b/gnomemusic/mpris.py
@@ -398,15 +398,23 @@ class MediaPlayer2Service(Server):
@log
def _get_active_playlist(self):
- playlist = None
- playlist_name = ''
- if self.player.get_playlist_type() == PlayerPlaylist.Type.PLAYLIST:
- playlist = self._get_playlist_from_id(
- self.player.get_playlist_id())
- playlist_name = utils.get_media_title(playlist)
+ """Get Active Maybe_Playlist
+
+ Maybe_Playlist is a structure describing a playlist, or nothing
+ according to MPRIS specifications.
+ If a playlist is active, return True and its description
+ (path, name and icon).
+ If no playlist is active, return False and an undefined structure.
+ :returns: playlist existence and its structure
+ :rtype: tuple
+ """
+ if self.player.get_playlist_type() != PlayerPlaylist.Type.PLAYLIST:
+ return (False, ("/", "", ""))
+ playlist = self._get_playlist_from_id(self.player.get_playlist_id())
+ playlist_name = utils.get_media_title(playlist)
path = self._get_playlist_path(playlist)
- return (playlist is not None, (path, playlist_name, ''))
+ return (True, (path, playlist_name, ""))
@log
def _on_current_song_changed(self, player, position):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]