l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #752 from gkeep/spotifyd-support

Browse source 
[modules/spotify] Add initial spotifyd compatibility
This commit is contained in:
tobi-wan-kenobi 2020-12-18 12:49:48 +01:00 committed by GitHub
commit 64355e5314
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
bumblebee_status/modules/contrib/spotify.py
View file

@ -10,6 +10,8 @@ Parameters:
Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next Widget names are: spotify.song, spotify.prev, spotify.pause, spotify.next
* spotify.concise_controls: When enabled, allows spotify to be controlled from just the spotify.song widget. * spotify.concise_controls: When enabled, allows spotify to be controlled from just the spotify.song widget.
Concise controls are: Left Click: Toggle Pause; Wheel Up: Next; Wheel Down; Previous. Concise controls are: Left Click: Toggle Pause; Wheel Up: Next; Wheel Down; Previous.
* spotify.bus_name: String (defaults to `spotify`)
Available values: spotify, spotifyd
contributed by `yvesh <https://github.com/yvesh>`_ - many thanks! contributed by `yvesh <https://github.com/yvesh>`_ - many thanks!
@ -35,6 +37,8 @@ class Module(core.module.Module):
self.background = True self.background = True
self.__bus_name = self.parameter("bus_name", "spotify")
self.__layout = util.format.aslist( self.__layout = util.format.aslist(
self.parameter( self.parameter(
"layout", "spotify.song,spotify.prev,spotify.pause,spotify.next", "layout", "spotify.song,spotify.prev,spotify.pause,spotify.next",
@ -46,7 +50,11 @@ class Module(core.module.Module):
self.__pause = "" self.__pause = ""
self.__format = self.parameter("format", "{artist} - {title}") self.__format = self.parameter("format", "{artist} - {title}")
self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \ if self.__bus_name == "spotifyd":
self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotifyd \
/org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
else:
self.__cmd = "dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
/org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player." /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."
widget_map = {} widget_map = {}
@ -104,9 +112,14 @@ class Module(core.module.Module):
def __get_song(self): def __get_song(self):
bus = self.__bus bus = self.__bus
spotify = bus.get_object( if self.__bus_name == "spotifyd":
"org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2" spotify = bus.get_object(
) "org.mpris.MediaPlayer2.spotifyd", "/org/mpris/MediaPlayer2"
)
else:
spotify = bus.get_object(
"org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
)
spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties") spotify_iface = dbus.Interface(spotify, "org.freedesktop.DBus.Properties")
props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata") props = spotify_iface.Get("org.mpris.MediaPlayer2.Player", "Metadata")
self.__song = self.__format.format( self.__song = self.__format.format(
@ -120,14 +133,20 @@ class Module(core.module.Module):
try: try:
self.__get_song() self.__get_song()
if self.__bus_name == "spotifyd":
bus = self.__bus.get_object(
"org.mpris.MediaPlayer2.spotifyd", "/org/mpris/MediaPlayer2"
)
else:
bus = self.__bus.get_object(
"org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2"
)
for widget in self.widgets(): for widget in self.widgets():
if widget.name == "spotify.pause": if widget.name == "spotify.pause":
playback_status = str( playback_status = str(
dbus.Interface( dbus.Interface(
self.__bus.get_object( bus,
"org.mpris.MediaPlayer2.spotify",
"/org/mpris/MediaPlayer2",
),
"org.freedesktop.DBus.Properties", "org.freedesktop.DBus.Properties",
).Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus") ).Get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")
) )