mpclient: handle MPD exceptions in delete()

1 files changed, 8 insertions, 6 deletions

diff --git a/nephilim/mpclient.py b/nephilim/mpclient.py
index ba3fd49..7c1afcf 100644
--- a/nephilim/mpclient.py
+++ b/nephilim/mpclient.py
@@ -308,10 +308,13 @@ class MPClient(QtCore.QObject):
         if not self._check_command_ok('deleteid'):
             return
         self._client.command_list_ok_begin()
-        for id in list:
-            self.logger.info('Deleting id %d from playlist.'%id)
-            self._client.deleteid(id)
-        self._client.command_list_end()
+        try:
+            for id in list:
+                self.logger.info('Deleting id %d from playlist.'%id)
+                self._client.deleteid(id)
+            self._client.command_list_end()
+        except mpd.CommandError, e:
+            self.logger.error('Error deleting files: %s.'%e)
     def clear(self):
         """Clear current playlist."""
         self.logger.info('Clearing playlist.')
@@ -331,7 +334,6 @@ class MPClient(QtCore.QObject):
             ret = self._client.command_list_end()
         except mpd.CommandError, e:
             self.logger.error('Error adding files: %s.'%e)
-        self._update_playlist()
         if self._status['state'] == 'stop' and ret:
             self.play(ret[0])
     def move(self, source, target):
@@ -402,7 +404,7 @@ class MPClient(QtCore.QObject):
             ret['time']   = 0
 
         if not 'songid' in ret:
-            ret['songid'] = -1
+            ret['songid'] = '-1'
 
         return ret
     def _check_command_ok(self, cmd):