Changeset 22

Timestamp:

Mar 11, 2006, 8:06:54 PM (19 years ago)

Author:

simon

Message:

Request format from mpc which can be (partially) eval()d.

File:

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

mpd-status/trunk/mpd-status.py

@@ -21 +21 @@
 from os.path import basename, splitext
 
-fieldnames = [
-    'artist', 'album', 'track', 'title', 'length', 'filename',
-    'status', 'pnum', 'time', 'percent'
-    ]
-delim = '::'
-format = delim.join([
-    "[%artist% - ]", "[%album% - ]", "[%track% - ]",
-    "[%title%]", "[%time%]", "[%file%]"
-    ])
-cmd = ['mpc', '--format', format]
-
+mpc_fmt = (
+"{"
+    "'artist': '''[%artist% - ]''', "
+    "'album': '''[%album% - ]''', "
+    "'track': '''[%track% - ]''', "
+    "'title': '''[%title%]''', "
+    "'time': '''[%time%]''', "
+    "'file': '''[%file%]'''"
+"}"
+)
+cmd = ['mpc', '--format', mpc_fmt]
 lines = Popen(cmd, stdout=PIPE).communicate()[0].split('\n')
 
 if len(lines) >= 3:
-    fields = dict(zip(
-        fieldnames,
-        map(
-            lambda s: s.strip('\"'),
-            lines[0].split(delim) + lines[1].split()
-            )
-        ))
+    fields = eval(lines[0])
+    line1 = lines[1].split()
+    fields.update(zip(['status', 'pnum', 'length', 'percent'], line1))
     status = fields['status'].strip('[]').capitalize() + ':'
     if fields['title']: