Changeset 28

Timestamp:

Feb 17, 2007, 4:14:34 PM (18 years ago)

Author:

simon

Message:

Stuck the status string grabby thing into a function so I could use it as a
module.

File:

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

mpd-status/trunk/mpd-status.py

@@ -18 +18 @@
 # 02110-1301, USA 
 
-from mpdclient2 import connect
 from os.path import sep, splitext
 from sre import compile
@@ -40 +39 @@
 strip_expr = compile('(%s)/' % r'|'.join(strip_paths))
 
-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
+def get_status(connection):
+    songinfo = {}
+    songinfo['state'] = state_map[connection.status()['state']]
+    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, ' - ')
+    return format % songinfo
+
+if __name__ == '__main__':
+    from mpdclient2 import connect
+    print get_status(connect())