[modules/spotify] Update to latest API
This commit is contained in:
parent
48dcd6a5ae
commit
0f368cfdf6
1 changed files with 24 additions and 32 deletions
|
@ -14,74 +14,66 @@ Parameters:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
import bumblebee.input
|
|
||||||
import bumblebee.output
|
|
||||||
import bumblebee.engine
|
|
||||||
|
|
||||||
from bumblebee.output import scrollable
|
|
||||||
|
|
||||||
try:
|
|
||||||
import dbus
|
import dbus
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
import core.module
|
||||||
|
import core.widget
|
||||||
|
import core.input
|
||||||
|
import core.decorators
|
||||||
|
|
||||||
class Module(bumblebee.engine.Module):
|
class Module(core.module.Module):
|
||||||
def __init__(self, engine, config):
|
def __init__(self, config):
|
||||||
super(Module, self).__init__(engine, config,
|
super().__init__(config, core.widget.Widget(self.spotify))
|
||||||
bumblebee.output.Widget(full_text=self.spotify)
|
|
||||||
)
|
buttons = {'LEFT_CLICK':core.input.LEFT_MOUSE,
|
||||||
buttons = {'LEFT_CLICK':bumblebee.input.LEFT_MOUSE,
|
'RIGHT_CLICK':core.input.RIGHT_MOUSE,
|
||||||
'RIGHT_CLICK':bumblebee.input.RIGHT_MOUSE,
|
'MIDDLE_CLICK':core.input.MIDDLE_MOUSE,
|
||||||
'MIDDLE_CLICK':bumblebee.input.MIDDLE_MOUSE,
|
'SCROLL_UP':core.input.WHEEL_UP,
|
||||||
'SCROLL_UP':bumblebee.input.WHEEL_UP,
|
'SCROLL_DOWN':core.input.WHEEL_DOWN,
|
||||||
'SCROLL_DOWN':bumblebee.input.WHEEL_DOWN,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self._song = ''
|
self.__song = ''
|
||||||
self._format = self.parameter('format', '{artist} - {title}')
|
self.__format = self.parameter('format', '{artist} - {title}')
|
||||||
prev_button = self.parameter('previous', 'LEFT_CLICK')
|
prev_button = self.parameter('previous', 'LEFT_CLICK')
|
||||||
next_button = self.parameter('next', 'RIGHT_CLICK')
|
next_button = self.parameter('next', 'RIGHT_CLICK')
|
||||||
pause_button = self.parameter('pause', 'MIDDLE_CLICK')
|
pause_button = self.parameter('pause', 'MIDDLE_CLICK')
|
||||||
|
|
||||||
cmd = 'dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
|
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.'
|
||||||
engine.input.register_callback(self, button=buttons[prev_button],
|
core.input.register(self, button=buttons[prev_button],
|
||||||
cmd=cmd + 'Previous')
|
cmd=cmd + 'Previous')
|
||||||
engine.input.register_callback(self, button=buttons[next_button],
|
core.input.register(self, button=buttons[next_button],
|
||||||
cmd=cmd + 'Next')
|
cmd=cmd + 'Next')
|
||||||
engine.input.register_callback(self, button=buttons[pause_button],
|
core.input.register(self, button=buttons[pause_button],
|
||||||
cmd=cmd + 'PlayPause')
|
cmd=cmd + 'PlayPause')
|
||||||
|
|
||||||
@scrollable
|
@core.decorators.scrollable
|
||||||
def spotify(self, widget):
|
def spotify(self, widget):
|
||||||
return self.string_song
|
return self.string_song
|
||||||
|
|
||||||
def hidden(self):
|
def hidden(self):
|
||||||
return self.string_song == ''
|
return self.string_song == ''
|
||||||
|
|
||||||
def update(self, widgets):
|
def update(self):
|
||||||
try:
|
try:
|
||||||
bus = dbus.SessionBus()
|
bus = dbus.SessionBus()
|
||||||
spotify = bus.get_object('org.mpris.MediaPlayer2.spotify', '/org/mpris/MediaPlayer2')
|
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')
|
||||||
playback_status = str(spotify_iface.Get('org.mpris.MediaPlayer2.Player', 'PlaybackStatus'))
|
playback_status = str(spotify_iface.Get('org.mpris.MediaPlayer2.Player', 'PlaybackStatus'))
|
||||||
self._song = self._format.format(album=str(props.get('xesam:album')),
|
self.__song = self.__format.format(album=str(props.get('xesam:album')),
|
||||||
title=str(props.get('xesam:title')),
|
title=str(props.get('xesam:title')),
|
||||||
artist=','.join(props.get('xesam:artist')),
|
artist=','.join(props.get('xesam:artist')),
|
||||||
trackNumber=str(props.get('xesam:trackNumber')),
|
trackNumber=str(props.get('xesam:trackNumber')),
|
||||||
playbackStatus=u'\u25B6' if playback_status=='Playing' else u'\u258D\u258D' if playback_status=='Paused' else '',)
|
playbackStatus=u'\u25B6' if playback_status=='Playing' else u'\u258D\u258D' if playback_status=='Paused' else '',)
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
self._song = ''
|
self.__song = ''
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def string_song(self):
|
def string_song(self):
|
||||||
if sys.version_info.major < 3:
|
if sys.version_info.major < 3:
|
||||||
return unicode(self._song)
|
return unicode(self.__song)
|
||||||
return str(self._song)
|
return str(self.__song)
|
||||||
|
|
||||||
|
|
||||||
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||||
|
|
Loading…
Reference in a new issue