from .utils import Range, escape
from .const import CONNECTION_MAX, CONNECTION_TIMEOUT
-from .const import ERROR_PREFIX, SUCCESS, NEXT
+from .const import HELLO_PREFIX, ERROR_PREFIX, SUCCESS, NEXT
log = logging.getLogger(__name__)
"""
def __init__(self, host: str | None = None,
- port: str | int | None = None,
- password: str | None = None):
+ port: str | int | None = None,
+ password: str | None = None):
#: Connection pool
self._pool = ConnectionPool(max_connections=CONNECTION_MAX)
#: connection timeout
"sendmessage": self._fetch_nothing,
}
self.command = None
- self._command_list = None
+ self._command_list: list | None = None
self.args = None
self.pool = pool
self.host = (server, port)
return retval
async def _init_connection(self):
- """Init connection if needed"""
+ """Init connection if needed
+
+ * Consumes the hello line and sets the protocol version
+ * Send password command if a password is provided
+ """
if not self.connection.version:
- # TODO: move hello here instead of connection?
- # Need to consume hello
- pass
+ await self._hello()
if self.password and not self.connection.auth:
# Need to send password
await self._write_command('password', [self.password])
await self._fetch_nothing()
self.connection.auth = True
+ async def _hello(self) -> None:
+ """Consume HELLO_PREFIX"""
+ data = await self.connection.readuntil(b'\n')
+ rcv = data.decode('utf-8')
+ if not rcv.startswith(HELLO_PREFIX):
+ raise MPDProtocolError(f'Got invalid MPD hello: "{rcv}"')
+ log.debug('consumed hello prefix: %r', rcv)
+ self.connection.version = rcv.split('\n')[0][len(HELLO_PREFIX):]
+
async def _write_line(self, line):
self.connection.write(f"{line!s}\n".encode())
await self.connection.drain()
amount -= len(result)
return bytes(chunk)
- async def _read_line(self, binary=False):
+ async def _read_line(self):
line = await self.connection.readline()
line = line.decode('utf-8')
if not line.endswith('\n'):
return None
return line
- async def _read_pair(self, separator, binary=False):
- line = await self._read_line(binary=binary)
+ async def _read_pair(self, separator):
+ line = await self._read_line()
if line is None:
return None
pair = line.split(separator, 1)
raise MPDProtocolError(f"Could not parse pair: '{line}'")
return pair
- async def _read_pairs(self, separator=": ", binary=False):
- pair = await self._read_pair(separator, binary=binary)
+ async def _read_pairs(self, separator=": "):
+ pair = await self._read_pair(separator)
while pair:
yield pair
- pair = await self._read_pair(separator, binary=binary)
+ pair = await self._read_pair(separator)
async def _read_list(self):
seen = None
async def _fetch_nothing(self):
line = await self._read_line()
if line is not None:
- raise ProtocolError(f"Got unexpected return value: '{line}'")
+ raise MPDProtocolError(f"Got unexpected return value: '{line}'")
async def _fetch_item(self):
pairs = [_ async for _ in self._read_pairs()]
async def _fetch_composite(self):
obj = {}
- async for key, value in self._read_pairs(binary=True):
+ async for key, value in self._read_pairs():
key = key.lower()
obj[key] = value
if key == 'binary':
raise ConnectionError('Error reading binary content: '
f'Expects {amount}B, got {data_bytes}')
# Fetches trailing new line
- await self._read_line(binary=True)
+ await self._read_line()
#ALT: await self.connection.readuntil(b'\n')
# Fetches SUCCESS code
- await self._read_line(binary=True)
+ await self._read_line()
#ALT: await self.connection.readuntil(b'OK\n')
return obj