X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=musicpd.py;h=a2637fb4c4aa139e11cd28cf7b1cd8e3ddc5de80;hb=f804516f274e5f1b94fa60545be7fb295566d9cb;hp=3d18bfedef1d937a8c68f17bd38d342eff5d88d9;hpb=96d64b58738f66d3b65ed18e43d3f24134323f1b;p=python-musicpd.git

diff --git a/musicpd.py b/musicpd.py
index 3d18bfe..a2637fb 100644
--- a/musicpd.py
+++ b/musicpd.py
@@ -18,6 +18,7 @@
 # pylint: disable=C0111
 
 import socket
+from functools import wraps
 
 
 HELLO_PREFIX = "OK MPD "
@@ -27,6 +28,24 @@ NEXT = "list_OK"
 VERSION = '0.4.2'
 
 
+def iterator_wrapper(func):
+    """Decorator handling iterate option"""
+    @wraps(func)
+    def decorated_function(instance, *args, **kwargs):
+        generator = func(instance, *args, **kwargs)
+        if not instance.iterate:
+            return list(generator)
+        instance._iterating = True
+        def iterator(gen):
+            try:
+                for item in gen:
+                    yield item
+            finally:
+                instance._iterating = False
+        return iterator(generator)
+    return decorated_function
+
+
 class MPDError(Exception):
     pass
 
@@ -55,6 +74,8 @@ class Range:
         self._check()
 
     def __str__(self):
+        if len(self.tpl) == 0:
+            return ':'
         if len(self.tpl) == 1:
             return '{0}:'.format(self.tpl[0])
         return '{0[0]}:{0[1]}'.format(self.tpl)
@@ -65,15 +86,14 @@ class Range:
     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]')
+        if len(self.tpl) not in [0, 1, 2]:
+            raise CommandError('length not in [0, 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
@@ -132,6 +152,7 @@ class MPDClient:
             "plchangesposid":     self._fetch_changes,
             "prio":               self._fetch_nothing,
             "prioid":             self._fetch_nothing,
+            "rangeid":            self._fetch_nothing,
             "shuffle":            self._fetch_nothing,
             "swap":               self._fetch_nothing,
             "swapid":             self._fetch_nothing,
@@ -185,6 +206,7 @@ class MPDClient:
             "toggleoutput":       self._fetch_nothing,
             "outputs":            self._fetch_outputs,
             # Reflection Commands
+            "config":             self._fetch_object,
             "commands":           self._fetch_list,
             "notcommands":        self._fetch_list,
             "tagtypes":           self._fetch_list,
@@ -354,19 +376,6 @@ class MPDClient:
             self._command_list = None
         self._fetch_nothing()
 
-    def _iterator_wrapper(self, iterator):
-        try:
-            for item in iterator:
-                yield item
-        finally:
-            self._iterating = False
-
-    def _wrap_iterator(self, iterator):
-        if not self.iterate:
-            return list(iterator)
-        self._iterating = True
-        return self._iterator_wrapper(iterator)
-
     def _fetch_nothing(self):
         line = self._read_line()
         if line is not None:
@@ -378,11 +387,13 @@ class MPDClient:
             return
         return pairs[0][1]
 
+    @iterator_wrapper
     def _fetch_list(self):
-        return self._wrap_iterator(self._read_list())
+        return self._read_list()
 
+    @iterator_wrapper
     def _fetch_playlist(self):
-        return self._wrap_iterator(self._read_playlist())
+        return self._read_playlist()
 
     def _fetch_object(self):
         objs = list(self._read_objects())
@@ -390,8 +401,9 @@ class MPDClient:
             return {}
         return objs[0]
 
+    @iterator_wrapper
     def _fetch_objects(self, delimiters):
-        return self._wrap_iterator(self._read_objects(delimiters))
+        return self._read_objects(delimiters)
 
     def _fetch_changes(self):
         return self._fetch_objects(["cpos"])
@@ -420,8 +432,9 @@ class MPDClient:
     def _fetch_neighbors(self):
         return self._fetch_objects(["neighbor"])
 
+    @iterator_wrapper
     def _fetch_command_list(self):
-        return self._wrap_iterator(self._read_command_list())
+        return self._read_command_list()
 
     def _hello(self):
         line = self._rfile.readline()
@@ -534,5 +547,4 @@ class MPDClient:
 def escape(text):
     return text.replace("\\", "\\\\").replace('"', '\\"')
 
-
 # vim: set expandtab shiftwidth=4 softtabstop=4 textwidth=79: