Allow send_noidle to cancel idle as plain noidle does

[python-musicpd.git] / musicpd.py

diff --git a/musicpd.py b/musicpd.py
index e281a922522fb257ff858393d3108eec505d1669..fe14987dc54af0355a399b90bd8f3c294b35c28b 100644 (file)
--- a/musicpd.py
+++ b/musicpd.py
@@ -24,7 +24,7 @@ HELLO_PREFIX = "OK MPD "
 ERROR_PREFIX = "ACK "
 SUCCESS = "OK"
 NEXT = "list_OK"
-VERSION = '0.4.0pr1'
+VERSION = '0.4.1'
 
 
 class MPDError(Exception):
@@ -48,15 +48,40 @@ class PendingCommandError(MPDError):
 class IteratingError(MPDError):
     pass
 
+class Range:
 
-class _NotConnected(object):
+    def __init__(self, tpl):
+        self.tpl = tpl
+        self._check()
+
+    def __str__(self):
+        if len(self.tpl) == 1:
+            return '{0}:'.format(self.tpl[0])
+        return '{0[0]}:{0[1]}'.format(self.tpl)
+
+    def __repr__(self):
+        return 'Range({0})'.format(self.tpl)
+
+    def _check(self):
+        if not isinstance(self.tpl, tuple):
+            raise CommandError('Wrong type, provide a tuple')
+        if len(self.tpl) not in [1, 2]:
+            raise CommandError('length not in [1, 2]')
+        for index in self.tpl:
+            try:
+                index = int(index)
+            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(object):
+class MPDClient:
     def __init__(self):
         self.iterate = False
         self._reset()
@@ -65,7 +90,7 @@ class MPDClient(object):
             "clearerror":         self._fetch_nothing,
             "currentsong":        self._fetch_object,
             "idle":               self._fetch_list,
-            "noidle":             None,
+            #"noidle":             None,
             "status":             self._fetch_object,
             "stats":              self._fetch_object,
             # Playback Option Commands
@@ -165,6 +190,8 @@ class MPDClient(object):
         }
 
     def __getattr__(self, attr):
+        if attr == 'send_noidle':  # have send_noidle to cancel idle as well as noidle
+            return self.noidle()
         if attr.startswith("send_"):
             command = attr.replace("send_", "", 1)
             wrapper = self._send
@@ -232,10 +259,15 @@ class MPDClient(object):
         self._wfile.write("%s\n" % line)
         self._wfile.flush()
 
-    def _write_command(self, command, args=[]):
+    def _write_command(self, command, args=None):
+        if args is None:
+            args = []
         parts = [command]
         for arg in args:
-            parts.append('"%s"' % escape(str(arg)))
+            if isinstance(arg, tuple):
+                parts.append('{0!s}'.format(Range(arg)))
+            else:
+                parts.append('"%s"' % escape(str(arg)))
         self._write_line(" ".join(parts))
 
     def _read_line(self):
@@ -282,11 +314,13 @@ class MPDClient(object):
             yield value
 
     def _read_playlist(self):
-        for key, value in self._read_pairs(":"):
+        for _, value in self._read_pairs(":"):
             yield value
 
-    def _read_objects(self, delimiters=[]):
+    def _read_objects(self, delimiters=None):
         obj = {}
+        if delimiters is None:
+            delimiters = []
         for key, value in self._read_pairs():
             key = key.lower()
             if obj:
@@ -410,7 +444,7 @@ class MPDClient(object):
         for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
                                       socket.SOCK_STREAM, socket.IPPROTO_TCP,
                                       flags):
-            af, socktype, proto, canonname, sa = res
+            af, socktype, proto, _, sa = res
             sock = None
             try:
                 sock = socket.socket(af, socktype, proto)
@@ -425,6 +459,14 @@ class MPDClient(object):
         else:
             raise ConnectionError("getaddrinfo returns an empty list")
 
+    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')
+        del self._pending[0]
+        self._write_command("noidle")
+        return self._fetch_list()
+
     def connect(self, host, port):
         if self._sock is not None:
             raise ConnectionError("Already connected")