Changeset 26

Timestamp:

Jun 5, 2006, 1:00:32 AM (18 years ago)

Author:

simon

Message:

Simplified info-grabbing. mpd-status is now more-or-less a wrapper to mpc.

File:

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

mpd-status/trunk/mpd-status.py

@@ -21 +21 @@
 from os.path import basename, splitext
 
-mpc_fmt = (
-"{"
-    "'artist': '''[%artist% - ]''', "
-    "'album': '''[%album% - ]''', "
-    "'track': '''[%track% - ]''', "
-    "'title': '''[%title%]''', "
-    "'length': '''[%time%]''', "
-    "'file': '''[%file%]'''"
-"}"
-)
+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]
 
-if len(lines) >= 3:
-    fields = eval(lines[0])
-    line1 = lines[1].split()
-    fields.update(zip(['status', 'pnum', 'time', 'percent'], line1))
-    status = fields['status'].strip('[]').capitalize() + ':'
-    if fields['title']:
-        title = '%(artist)s%(album)s%(track)s%(title)s' % fields
-    else:
-        title = splitext(basename(fields['file']))[0]
-    time = '%(time)s/%(length)s %(percent)s' % fields
-    outstr = '%s %s [%s]' % (status, title, time)
-else:
-    outstr = '--Not playing--'
+if len(lines) >= 4:
+    (status, pnum, time, percent) = lines[2].split()
+    outstr = status + ' ' + outstr
 
 print outstr