X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;ds=sidebyside;f=mpd.py;h=ce1784b4227da5aa437801ef2d536b91d8cb4851;hb=4f4b01dd0d04a341f6834fdca4d777ff5d6850db;hp=e16c8b8aa584ca7a5b5db0fa86faf002cc0afd5c;hpb=ecdbc2e2d41d0e4545d6e4c68e9fd00e0f6129c3;p=python-musicpd.git

diff --git a/mpd.py b/mpd.py
index e16c8b8..ce1784b 100644
--- a/mpd.py
+++ b/mpd.py
@@ -39,6 +39,13 @@ class CommandListError(MPDError):
     pass
 
 
+class _NotConnected(object):
+    def __getattr__(self, attr):
+        return self._dummy
+
+    def _dummy(*args):
+        raise ConnectionError, "Not connected"
+
 class MPDClient(object):
     def __init__(self):
         self.iterate = False
@@ -134,8 +141,8 @@ class MPDClient(object):
         self._commandlist.append(retval)
 
     def _writeline(self, line):
-        self._sockfile.write("%s\n" % line)
-        self._sockfile.flush()
+        self._wfile.write("%s\n" % line)
+        self._wfile.flush()
 
     def _writecommand(self, command, args=[]):
         parts = [command]
@@ -144,7 +151,7 @@ class MPDClient(object):
         self._writeline(" ".join(parts))
 
     def _readline(self):
-        line = self._sockfile.readline()
+        line = self._rfile.readline()
         if not line.endswith("\n"):
             raise ConnectionError, "Connection lost while reading line"
         line = line.rstrip("\n")
@@ -265,7 +272,7 @@ class MPDClient(object):
         return self._wrapiterator(self._readcommandlist())
 
     def _hello(self):
-        line = self._sockfile.readline()
+        line = self._rfile.readline()
         if not line.endswith("\n"):
             raise ConnectionError, "Connection lost while reading MPD hello"
         if not line.startswith(HELLO_PREFIX):
@@ -275,16 +282,22 @@ 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+")
+        self._sock = None
+        self._rfile = _NotConnected()
+        self._wfile = _NotConnected()
 
     def connect(self, host, port):
-        self.disconnect()
+        if self._sock:
+            raise ConnectionError, "Already connected"
+        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self._sock.connect((host, port))
+        self._rfile = self._sock.makefile("rb")
+        self._wfile = self._sock.makefile("wb")
         self._hello()
 
     def disconnect(self):
-        self._sockfile.close()
+        self._rfile.close()
+        self._wfile.close()
         self._sock.close()
         self._reset()