From 0f368cfdf63a01dfa460aca705137bedaad0c9cb Mon Sep 17 00:00:00 2001
From: tobi-wan-kenobi <tobi-wan-kenobi@users.noreply.github.com>
Date: Sat, 25 Apr 2020 10:51:40 +0200
Subject: [PATCH] [modules/spotify] Update to latest API

---
 modules/contrib/spotify.py | 56 ++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/modules/contrib/spotify.py b/modules/contrib/spotify.py
index b7fa14e..672423e 100644
--- a/modules/contrib/spotify.py
+++ b/modules/contrib/spotify.py
@@ -14,74 +14,66 @@ Parameters:
 """
 
 import sys
+import dbus
 
-import bumblebee.input
-import bumblebee.output
-import bumblebee.engine
+import core.module
+import core.widget
+import core.input
+import core.decorators
 
-from bumblebee.output import scrollable
+class Module(core.module.Module):
+    def __init__(self, config):
+        super().__init__(config, core.widget.Widget(self.spotify))
 
-try:
-    import dbus
-except ImportError:
-    pass
-
-
-class Module(bumblebee.engine.Module):
-    def __init__(self, engine, config):
-        super(Module, self).__init__(engine, config,
-                                     bumblebee.output.Widget(full_text=self.spotify)
-                                     )
-        buttons = {'LEFT_CLICK':bumblebee.input.LEFT_MOUSE,
-                   'RIGHT_CLICK':bumblebee.input.RIGHT_MOUSE,
-                   'MIDDLE_CLICK':bumblebee.input.MIDDLE_MOUSE,
-                   'SCROLL_UP':bumblebee.input.WHEEL_UP,
-                   'SCROLL_DOWN':bumblebee.input.WHEEL_DOWN,
+        buttons = {'LEFT_CLICK':core.input.LEFT_MOUSE,
+                   'RIGHT_CLICK':core.input.RIGHT_MOUSE,
+                   'MIDDLE_CLICK':core.input.MIDDLE_MOUSE,
+                   'SCROLL_UP':core.input.WHEEL_UP,
+                   'SCROLL_DOWN':core.input.WHEEL_DOWN,
                    }
         
-        self._song = ''
-        self._format = self.parameter('format', '{artist} - {title}')
+        self.__song = ''
+        self.__format = self.parameter('format', '{artist} - {title}')
         prev_button = self.parameter('previous', 'LEFT_CLICK')
         next_button = self.parameter('next', 'RIGHT_CLICK')
         pause_button = self.parameter('pause', 'MIDDLE_CLICK')
 
         cmd = 'dbus-send --session --type=method_call --dest=org.mpris.MediaPlayer2.spotify \
                 /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')
-        engine.input.register_callback(self, button=buttons[next_button],
+        core.input.register(self, button=buttons[next_button],
             cmd=cmd + 'Next')
-        engine.input.register_callback(self, button=buttons[pause_button],
+        core.input.register(self, button=buttons[pause_button],
             cmd=cmd + 'PlayPause')
 
-    @scrollable
+    @core.decorators.scrollable
     def spotify(self, widget):
         return self.string_song
 
     def hidden(self):
         return self.string_song == ''
 
-    def update(self, widgets):
+    def update(self):
         try:
             bus = dbus.SessionBus()
             spotify = bus.get_object('org.mpris.MediaPlayer2.spotify', '/org/mpris/MediaPlayer2')
             spotify_iface = dbus.Interface(spotify, 'org.freedesktop.DBus.Properties')
             props = spotify_iface.Get('org.mpris.MediaPlayer2.Player', 'Metadata')
             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')),
                                              artist=','.join(props.get('xesam:artist')),
                                              trackNumber=str(props.get('xesam:trackNumber')),
                                              playbackStatus=u'\u25B6' if playback_status=='Playing' else u'\u258D\u258D' if playback_status=='Paused' else '',)
             
         except Exception:
-            self._song = ''
+            self.__song = ''
 
     @property
     def string_song(self):
         if sys.version_info.major < 3:
-            return unicode(self._song)
-        return str(self._song)
+            return unicode(self.__song)
+        return str(self.__song)
         
-
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4