Changeset 27

Timestamp:

Feb 17, 2007, 3:49:56 PM (18 years ago)

Author:

simon

Message:

Rewrite to use mpdclient instead of invoking the command-line mpc.

File:

• mpd-status/trunk/mpd-status.py (modified) (1 diff)

mpd-status/trunk/mpd-status.py

@@ -18 +18 @@
 # 02110-1301, USA 
 
-from subprocess import Popen, PIPE
-from os.path import basename, splitext
+from mpdclient2 import connect
+from os.path import sep, splitext
+from sre import compile
 
-mpc_fmt = '[[%artist% - ][%album% - ][%track% - ]%title%]\n[%file%]'
-cmd = ['mpc', '--format', mpc_fmt]
-lines = Popen(cmd, stdout=PIPE).communicate()[0].split('\n')
-outstr = lines[0] or splitext(basename(lines[1]))[0]
+state_map = {
+    'play': 'Playing',
+    'pause': 'Paused',
+    'stop': 'Stopped'
+    }
+fields = ['artist', 'album', 'track', 'title']
+format = '♫ %(state)s: %(song)s'
+strip_paths = [
+    'albums',
+    'classical',
+    'houseofdoom',
+    'mods',
+    'original',
+    'soundtracks'
+    ]
 
-if len(lines) >= 4:
-    (status, pnum, time, percent) = lines[2].split()
-    outstr = status + ' ' + outstr
+strip_expr = compile('(%s)/' % r'|'.join(strip_paths))
 
-print outstr
-
+songinfo = {}
+mpc = connect()
+songinfo['state'] = state_map[mpc.status()['state']]
+song = mpc.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, ' - ')
+print format % songinfo