NEXT = "list_OK"
VERSION = '0.4.4'
+CONNECTION_TIMEOUT = 5 # seconds before a tcp connection attempt times out
def iterator_wrapper(func):
"""Decorator handling iterate option"""
"rm": self._fetch_nothing,
"save": self._fetch_nothing,
# Database Commands
- #"albumart": self._fetch_object,
+ "albumart": self._fetch_composite,
"count": self._fetch_object,
"find": self._fetch_songs,
"findadd": self._fetch_nothing,
def _fetch_neighbors(self):
return self._fetch_objects(["neighbor"])
+ def _fetch_composite(self):
+ obj = {}
+ for key, value in self._read_pairs():
+ key = key.lower()
+ obj[key] = value
+ if key == 'binary':
+ break
+ by = self._read_line()
+ obj['data'] = by.encode(errors='surrogateescape')
+ return obj
+
@iterator_wrapper
def _fetch_command_list(self):
return self._read_command_list()
sock = None
try:
sock = socket.socket(af, socktype, proto)
+ sock.settimeout(CONNECTION_TIMEOUT)
sock.connect(sa)
+ sock.settimeout(None)
return sock
except socket.error as socket_err:
err = socket_err
self._sock = self._connect_unix(host)
else:
self._sock = self._connect_tcp(host, port)
- self._rfile = self._sock.makefile("r", encoding='utf-8')
+ self._rfile = self._sock.makefile("r", encoding='utf-8', errors='surrogateescape')
self._wfile = self._sock.makefile("w", encoding='utf-8')
try:
self._hello()