From c3789a13992fa16e63786ed482317842304b1ae2 Mon Sep 17 00:00:00 2001
From: Yves Hoppe <yves.hoppe@community.joomla.org>
Date: Fri, 26 May 2017 21:14:05 +0200
Subject: [PATCH 1/2] [modules/spotify] Add rudimentary spotify currently
 playing module

---
 bumblebee/modules/spotify.py | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 bumblebee/modules/spotify.py

diff --git a/bumblebee/modules/spotify.py b/bumblebee/modules/spotify.py
new file mode 100644
index 0000000..0ac96c7
--- /dev/null
+++ b/bumblebee/modules/spotify.py
@@ -0,0 +1,41 @@
+# pylint: disable=C0111,R0903
+
+"""Displays the current song being played
+
+Requires the following library:
+    * python-dbus
+
+Parameters:
+"""
+
+import bumblebee.input
+import bumblebee.output
+import bumblebee.engine
+
+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)
+                                     )
+        self._song = ""
+
+    def spotify(self, widget):
+        return str(self._song)
+
+    def update(self, widgets):
+        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')
+            self._song = (str(props['xesam:artist'][0]) + " - " + str(props['xesam:title']))
+        except dbus.exceptions.DBusException:
+            self._song = "Error: DBus Exception"
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

From cffd2b8609900509b64dbcfadcc585d0cdb7728f Mon Sep 17 00:00:00 2001
From: Yves Hoppe <yves.hoppe@community.joomla.org>
Date: Fri, 26 May 2017 21:33:58 +0200
Subject: [PATCH 2/2] handling closed spotify better

---
 bumblebee/modules/spotify.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bumblebee/modules/spotify.py b/bumblebee/modules/spotify.py
index 0ac96c7..e4fd87a 100644
--- a/bumblebee/modules/spotify.py
+++ b/bumblebee/modules/spotify.py
@@ -14,6 +14,7 @@ import bumblebee.engine
 
 try:
     import dbus
+    from dbus.exceptions import DBusException
 except ImportError:
     pass
 
@@ -35,7 +36,7 @@ class Module(bumblebee.engine.Module):
             spotify_iface = dbus.Interface(spotify, 'org.freedesktop.DBus.Properties')
             props = spotify_iface.Get('org.mpris.MediaPlayer2.Player', 'Metadata')
             self._song = (str(props['xesam:artist'][0]) + " - " + str(props['xesam:title']))
-        except dbus.exceptions.DBusException:
-            self._song = "Error: DBus Exception"
+        except DBusException:
+            self._song = ""
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4