# python-musicpd: Python MPD client library
# Copyright (C) 2008-2010 J. Alexander Treuman <jat@spatialrift.net>
-# Copyright (C) 2012-2018 Kaliko Jack <kaliko@azylum.org>
+# Copyright (C) 2012-2019 Kaliko Jack <kaliko@azylum.org>
+# Copyright (C) 2019 Naglis Jonaitis <naglis@mailbox.org>
#
# python-musicpd is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
ERROR_PREFIX = "ACK "
SUCCESS = "OK"
NEXT = "list_OK"
-VERSION = '0.4.3'
+VERSION = '0.4.4'
def iterator_wrapper(func):
if not instance.iterate:
return list(generator)
instance._iterating = True
+
def iterator(gen):
try:
for item in gen:
class MPDError(Exception):
pass
+
class ConnectionError(MPDError):
pass
+
class ProtocolError(MPDError):
pass
+
class CommandError(MPDError):
pass
+
class CommandListError(MPDError):
pass
+
class PendingCommandError(MPDError):
pass
+
class IteratingError(MPDError):
pass
+
class Range:
def __init__(self, tpl):
except (TypeError, ValueError):
raise CommandError('Not a tuple of int')
+
class _NotConnected:
+
def __getattr__(self, attr):
return self._dummy
def _dummy(*args):
raise ConnectionError("Not connected")
+
class MPDClient:
+
"""MPDClient instance will look for ``MPD_HOST``/``MPD_PORT``/``XDG_RUNTIME_DIR`` environment
- variables and set instance attribute ``host``, ``port`` and ``password``
+ variables and set instance attribute ``host``, ``port`` and ``pwd``
accordingly.
Then :py:obj:`musicpd.MPDClient.connect` will use ``host`` and ``port`` as defaults if not provided as args.
Cf. :py:obj:`musicpd.MPDClient.connect` for details.
- >>> from os inport environ
+ >>> from os import environ
>>> environ['MPD_HOST'] = 'pass@mpdhost'
>>> cli = musicpd.MPDClient()
- >>> cli.password == environ['MPD_HOST'].split('@')[0]
+ >>> cli.pwd == environ['MPD_HOST'].split('@')[0]
True
>>> cli.host == environ['MPD_HOST'].split('@')[1]
True
"seekid": self._fetch_nothing,
"seekcur": self._fetch_nothing,
"stop": self._fetch_nothing,
- # Playlist Commands
+ # Queue Commands
"add": self._fetch_nothing,
"addid": self._fetch_item,
"clear": self._fetch_nothing,
"rm": self._fetch_nothing,
"save": self._fetch_nothing,
# Database Commands
+ #"albumart": self._fetch_object,
"count": self._fetch_object,
"find": self._fetch_songs,
"findadd": self._fetch_nothing,
"list": self._fetch_list,
"listall": self._fetch_database,
"listallinfo": self._fetch_database,
+ "listfiles": self._fetch_database,
"lsinfo": self._fetch_database,
+ "readcomments": self._fetch_object,
"search": self._fetch_songs,
"searchadd": self._fetch_nothing,
"searchaddpl": self._fetch_nothing,
"update": self._fetch_item,
"rescan": self._fetch_item,
- "readcomments": self._fetch_object,
# Mounts and neighbors
"mount": self._fetch_nothing,
"unmount": self._fetch_nothing,
"kill": None,
"password": self._fetch_nothing,
"ping": self._fetch_nothing,
+ "tagtypes": self._fetch_list,
+ "tagtypes disable": self._fetch_nothing,
+ "tagtypes enable": self._fetch_nothing,
+ "tagtypes clear": self._fetch_nothing,
+ "tagtypes all": self._fetch_nothing,
+ # Partition Commands
+ "partition": self._fetch_nothing,
+ "listpartitions": self._fetch_list,
+ "newpartition": self._fetch_nothing,
# Audio Output Commands
"disableoutput": self._fetch_nothing,
"enableoutput": self._fetch_nothing,
"toggleoutput": self._fetch_nothing,
"outputs": self._fetch_outputs,
+ "outputset": self._fetch_nothing,
# Reflection Commands
"config": self._fetch_object,
"commands": self._fetch_list,
"notcommands": self._fetch_list,
- "tagtypes": self._fetch_list,
"urlhandlers": self._fetch_list,
"decoders": self._fetch_plugins,
# Client to Client
else use MPD_HOST=${XDG_RUNTIME_DIR:-/run/}/mpd/socket if file exists
"""
self.host = 'localhost'
- self.password = None
+ self.pwd = None
self.port = os.environ.get('MPD_PORT', '6600')
mpd_host_env = os.environ.get('MPD_HOST')
if mpd_host_env:
mpd_host_env.reverse()
self.host = mpd_host_env[0]
if len(mpd_host_env) > 1 and mpd_host_env[1]:
- self.password = mpd_host_env[1]
+ self.pwd = mpd_host_env[1]
else:
# Is socket there
xdg_runtime_dir = os.environ.get('XDG_RUNTIME_DIR', '/run')
raise IteratingError("Cannot execute '%s' while iterating" %
command)
if self._pending:
- raise PendingCommandError("Cannot execute '%s' with "
- "pending commands" % command)
+ raise PendingCommandError(
+ "Cannot execute '%s' with pending commands" % command)
retval = self._commands[command]
if self._command_list is not None:
if not callable(retval):
- raise CommandListError("'%s' not allowed in command list" %
- command)
+ raise CommandListError(
+ "'%s' not allowed in command list" % command)
self._write_command(command, args)
self._command_list.append(retval)
else:
def _connect_unix(self, path):
if not hasattr(socket, "AF_UNIX"):
- raise ConnectionError("Unix domain sockets not supported "
- "on this platform")
+ raise ConnectionError(
+ "Unix domain sockets not supported on this platform")
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sock.connect(path)
return sock
def noidle(self):
# noidle's special case
if not self._pending or self._pending[0] != 'idle':
- raise CommandError('cannot send noidle if send_idle was not called')
+ raise CommandError(
+ 'cannot send noidle if send_idle was not called')
del self._pending[0]
self._write_command("noidle")
return self._fetch_list()