mpd_cmdlist context manager stores return values.

qygmy/connection.py

@@ -121,13 +121,17 @@ def not_callable(*args):
     raise TypeError("Not callable")
 
 
-class MPDCommandList:
-    def __init__(self, conn):
-        self.conn = conn
-    def __enter__(self):
-        self.conn.command_list_ok_begin()
-    def __exit__(self, *exc):
-        self.conn.command_list_end()
+def mpd_cmdlist_context_manager(connection):
+    class MPDCommandList:
+        conn = connection
+
+        def __enter__(self):
+            self.conn.command_list_ok_begin()
+            return self
+
+        def __exit__(self, *exc):
+            self.retval = self.conn.command_list_end()
+    return MPDCommandList
 
 
 class Connection:
@@ -169,7 +173,7 @@ def __init__(self, main):
         super().__init__(main)
         self.main = main
         self.conn = mpd.MPDClient()
-        self.mpd_cmdlist = MPDCommandList(self.conn)
+        self.mpd_cmdlist = mpd_cmdlist_context_manager(self.conn)
         State.create(self, 'state', 'disconnect', not_callable)
 
     def update_state(self):

qygmy/lists.py

@@ -162,7 +162,7 @@ def add(self, items, pos=None, **kwargs):
         if pos is not None:
             a = reversed(a)
         last = len(self)
-        with self.mpd_cmdlist:
+        with self.mpd_cmdlist():
             for i in a:
                 self.add_one(i, pos, last, **kwargs)
                 last += 1
@@ -188,7 +188,7 @@ def remove(self, positions):
                 i = self[pos].copy()
                 i['pos'] = str(pos)
                 items.append(i)
-            with self.mpd_cmdlist:
+            with self.mpd_cmdlist():
                 for i in reversed(sorted(items, key=lambda x: int(x['pos']))):
                     self.remove_one(i)
             self.refresh()
@@ -213,7 +213,7 @@ def move(self, items, pos):
         b = (i for i in items if int(i['pos']) > pos)
         apos = pos
         bpos = pos + (0 if len(a) == 0 else 1)
-        with self.mpd_cmdlist:
+        with self.mpd_cmdlist():
             for i in reversed(a):
                 if apos != i['pos']:
                     self.move_one(i, apos)
@@ -310,14 +310,14 @@ def set_priority(self, positions, prio):
         if self.can_set_priority(positions, prio):
             ids = [self[i]['id'] for i in positions]
             batch_size = self.MAX_MPD_ARGUMENTS - 1
-            with self.mpd_cmdlist:
+            with self.mpd_cmdlist():
                 for k in range((len(ids) - 1) // batch_size + 1):
                     b = ids[k * batch_size:(k+1) * batch_size]
                     self.conn.prioid(prio, *b)
 
     @mpd_cmd
     def reverse(self):
-        with mpd_cmdlist:
+        with self.mpd_cmdlist():
             n = len(self)
             for i in range(n//2 + 1):
                 self.conn.swap(i, n-i-1)
@@ -326,7 +326,7 @@ def item_chosen(self, pos):
         self.current_pos.send(pos)
 
     def _update_current_pos(self, new, old):
-        for i in {old, new}:
+        for i in (old, new):
             if 0 <= i < len(self):
                 index1 = self.index(i, 0)
                 index2 = self.index(i, self.columnCount() - 1)

qygmy/server.py

@@ -39,14 +39,14 @@ def start_timer(self, interval=500):
 
     def update_state(self):
         s, c = {'state': 'disconnect'}, {}
-        if self.state.value != 'disconnect':
-            try:
-                self.conn.command_list_ok_begin()
-                self.conn.status()
-                self.conn.currentsong()
-                s, c = self.conn.command_list_end()
-            except (mpd.MPDError, OSError) as e:
-                self.handle_error(e)
+        try:
+            if self.state.value != 'disconnect':
+                with self.mpd_cmdlist() as cl:
+                    self.conn.status()
+                    self.conn.currentsong()
+                s, c = cl.retval
+        except (mpd.MPDError, OSError) as e:
+            self.handle_error(e)
 
         self.state.update(s['state'])
         self.times.update(s.get('time', ':').split(':'))