Fix small issues with music module

The reconnect wrapper couldn’t be used to return values and this
sometimes caused crashes when getting current playback status. Also
espeak was only being passed track names etc in ASCII so fixed to allow
UTF-8 to get through.

1 files changed, 3 insertions, 3 deletions

diff --git a/client/music.py b/client/music.py
index 2b6c055..ca9b776 100644
--- a/client/music.py
+++ b/client/music.py
@@ -17,14 +17,14 @@ def reconnect(func, *default_args, **default_kwargs):
 
         # sometimes not enough to just connect
         try:
-            func(self, *default_args, **default_kwargs)
+            return func(self, *default_args, **default_kwargs)
         except:
             self.client = MPDClient()
             self.client.timeout = None
             self.client.idletimeout = None
             self.client.connect("localhost", 6600)
 
-            func(self, *default_args, **default_kwargs)
+            return func(self, *default_args, **default_kwargs)
 
     return wrap
 
@@ -103,7 +103,7 @@ class Music:
 
         self.client.play()
 
-    #@reconnect -- this makes the function return None for some reason!
+    @reconnect
     def current_song(self):
         item = self.client.playlistinfo(int(self.client.status()["song"]))[0]
         result = "%s by %s" % (item["title"], item["artist"])