class MPDError(Exception):
pass
+class ConnectionError(MPDError):
+ pass
+
class ProtocolError(MPDError):
pass
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
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]
self._writeline(" ".join(parts))
def _readline(self):
- line = self._sockfile.readline().rstrip("\n")
+ line = self._rfile.readline()
+ if not line.endswith("\n"):
+ raise ConnectionError, "Connection lost while reading line"
+ line = line.rstrip("\n")
if line.startswith(ERROR_PREFIX):
error = line[len(ERROR_PREFIX):].strip()
raise CommandError, error
return self._wrapiterator(self._readcommandlist())
def _hello(self):
- line = self._sockfile.readline().rstrip("\n")
+ line = self._rfile.readline()
+ if not line.endswith("\n"):
+ raise ConnectionError, "Connection lost while reading MPD hello"
+ line = line.rstrip("\n")
if not line.startswith(HELLO_PREFIX):
raise ProtocolError, "Got invalid MPD hello: '%s'" % line
self.mpd_version = line[len(HELLO_PREFIX):].strip()
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()
- self._sock.connect((host, port))
- self._hello()
+ if self._sock:
+ raise ConnectionError, "Already connected"
+ msg = "getaddrinfo returns an empty list"
+ for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
+ socket.SOCK_STREAM, socket.IPPROTO_TCP,
+ socket.AI_ADDRCONFIG):
+ af, socktype, proto, canonname, sa = res
+ try:
+ self._sock = socket.socket(af, socktype, proto)
+ self._sock.connect(sa)
+ except socket.error, msg:
+ if self._sock:
+ self._sock.close()
+ self._sock = None
+ continue
+ break
+ if not self._sock:
+ raise socket.error, msg
+ self._rfile = self._sock.makefile("rb")
+ self._wfile = self._sock.makefile("wb")
+ try:
+ self._hello()
+ except (socket.error, MPDError):
+ self.disconnect()
+ raise
def disconnect(self):
- self._sockfile.close()
+ self._rfile.close()
+ self._wfile.close()
self._sock.close()
self._reset()