X-Git-Url: http://git.kaliko.me/?p=python-musicpd.git;a=blobdiff_plain;f=mpd.py;h=d725bb23389a19790a3beec7b80450a91b5bbb7b;hp=7e92cc084426290971b0b00d37ca543a35befe60;hb=96c1cf2845f70ef969b4c4ba0d946c0c5c9d433b;hpb=9a76b6eab8a8a46c822aadfa2aa44f37c6d23013

diff --git a/mpd.py b/mpd.py
index 7e92cc0..d725bb2 100644
--- a/mpd.py
+++ b/mpd.py
@@ -1,13 +1,17 @@
-#! /usr/bin/env python
-
-# TODO: return {} if no object read (?)
-# TODO: implement argument checking/parsing (?)
-# TODO: check for EOF when reading and benchmark it
-# TODO: command_list support
-# TODO: converter support
-# TODO: global for parsing MPD_HOST/MPD_PORT
-# TODO: global for parsing MPD error messages
-# TODO: IPv6 support (AF_INET6)
+# Copyright (C) 2008  J. Alexander Treuman <jat@spatialrift.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import socket
 
@@ -15,6 +19,7 @@ import socket
 HELLO_PREFIX = "OK MPD "
 ERROR_PREFIX = "ACK "
 SUCCESS = "OK"
+NEXT = "list_OK"
 
 
 class MPDError(Exception):
@@ -26,6 +31,9 @@ class ProtocolError(MPDError):
 class CommandError(MPDError):
     pass
 
+class CommandListError(MPDError):
+    pass
+
 
 class MPDClient(object):
     def __init__(self):
@@ -112,16 +120,20 @@ class MPDClient(object):
         return lambda *args: self._docommand(attr, args, retval)
 
     def _docommand(self, command, args, retval):
+        if self._commandlist is not None and not callable(retval):
+            raise CommandListError, "%s not allowed in command list" % command
         self._writecommand(command, args)
-        if callable(retval):
-            return retval()
-        return retval
+        if self._commandlist is None:
+            if callable(retval):
+                return retval()
+            return retval
+        self._commandlist.append(retval)
 
     def _writeline(self, line):
         self._sockfile.write("%s\n" % line)
         self._sockfile.flush()
 
-    def _writecommand(self, command, args):
+    def _writecommand(self, command, args=[]):
         parts = [command]
         for arg in args:
             parts.append('"%s"' % escape(str(arg)))
@@ -132,7 +144,12 @@ class MPDClient(object):
         if line.startswith(ERROR_PREFIX):
             error = line[len(ERROR_PREFIX):].strip()
             raise CommandError, error
-        if line == SUCCESS:
+        if self._commandlist is not None:
+            if line == NEXT:
+                return
+            if line == SUCCESS:
+                raise ProtocolError, "Got unexpected '%s'" % SUCCESS
+        elif line == SUCCESS:
             return
         return line
 
@@ -187,6 +204,13 @@ class MPDClient(object):
             yield obj
         raise StopIteration
 
+    def _readcommandlist(self):
+        for retval in self._commandlist:
+            yield retval()
+        self._commandlist = None
+        self._getnone()
+        raise StopIteration
+
     def _wrapiterator(self, iterator):
         if not self.iterate:
             return list(iterator)
@@ -212,7 +236,7 @@ class MPDClient(object):
     def _getobject(self):
         objs = list(self._readobjects())
         if not objs:
-            return
+            return {}
         return objs[0]
 
     def _getobjects(self, delimiters):
@@ -230,6 +254,9 @@ class MPDClient(object):
     def _getchanges(self):
         return self._getobjects(["cpos"])
 
+    def _getcommandlist(self):
+        return self._wrapiterator(self._readcommandlist())
+
     def _hello(self):
         line = self._sockfile.readline().rstrip("\n")
         if not line.startswith(HELLO_PREFIX):
@@ -238,6 +265,7 @@ class MPDClient(object):
 
     def _reset(self):
         self.mpd_version = None
+        self._commandlist = None
         self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self._sockfile = self._sock.makefile("rb+")
 
@@ -251,6 +279,18 @@ class MPDClient(object):
         self._sock.close()
         self._reset()
 
+    def command_list_ok_begin(self):
+        if self._commandlist is not None:
+            raise CommandListError, "Already in command list"
+        self._writecommand("command_list_ok_begin")
+        self._commandlist = []
+
+    def command_list_end(self):
+        if self._commandlist is None:
+            raise CommandListError, "Not in command list"
+        self._writecommand("command_list_end")
+        return self._getcommandlist()
+
 
 def escape(text):
     return text.replace("\\", "\\\\").replace('"', '\\"')