Changeset 31

Timestamp:

Feb 18, 2007, 1:51:33 AM (18 years ago)

Author:

simon

Message:

Munge to Unicode -- py-libmpdclient appears to return standard byte strings.

File:

• mpd-status/trunk/mpdstatus.py (modified) (2 diffs)

mpd-status/trunk/mpdstatus.py

@@ -20 +20 @@
 from os.path import sep, splitext
 from sre import compile
-
+import sys
 state_map = {
-    'play': 'Playing',
-    'pause': 'Paused',
-    'stop': 'Stopped'
+    'play': u'Playing',
+    'pause': u'Paused',
+    'stop': u'Stopped'
     }
 fields = ['artist', 'album', 'track', 'title']
 strip_paths = [
-    'albums',
-    'classical',
-    'houseofdoom',
-    'mods',
-    'original',
-    'soundtracks'
+    u'albums',
+    u'classical',
+    u'houseofdoom',
+    u'mods',
+    u'original',
+    u'soundtracks'
     ]
 
-strip_expr = compile('(%s)/' % r'|'.join(strip_paths))
+strip_expr = compile(u'(%s)/' % ur'|'.join(strip_paths))
 
 def get_status(connection):
@@ -43 +43 @@
     song = connection.currentsong()
     songinfo['song'] = \
-        ' - '.join([song[f] for f in fields if song.has_key(f)]) \
-        or strip_expr.sub('', splitext(song['file'])[0]).replace(sep, ' - ')
+        u' - '.join([unicode(song[f])
+        for f in fields
+            if song.has_key(f)]) \
+            or unicode(strip_expr.sub(u'',
+                    splitext(unicode(song['file']))[0]).replace(sep, u' - '))
     return songinfo
 
 if __name__ == '__main__':
+    import locale, codecs
     from mpdclient2 import connect
-    format = '♫ %(state)s: %(song)s'
+    enc = locale.getpreferredencoding()
+    sys.stdout = codecs.getwriter(enc)(sys.__stdout__)
+    format = u'♫ %(state)s: %(song)s'
     print format % get_status(connect())