[#2250] [WebUI] [Console] Use new core.remove_torrents method

deluge/ui/console/commands/rm.py

@@ -34,8 +34,14 @@ class Command(BaseCommand):
         for arg in args:
             torrent_ids.extend(self.console.match_torrent(arg))
 
-        for torrent_id in torrent_ids:
+        def on_removed_finished(errors):
-            client.core.remove_torrent(torrent_id, options["remove_data"])
+            if errors:
+                self.console.write("Error(s) occured when trying to delete torrent(s).")
+                for t_id, e_msg in errors:
+                    self.console.write("Error removing torrent %s : %s" % (t_id, e_msg))
+
+        d = client.core.remove_torrents(torrent_ids, options["remove_data"])
+        d.addCallback(on_removed_finished)
 
     def complete(self, line):
         # We use the ConsoleUI torrent tab complete method

deluge/ui/console/modes/torrent_actions.py

@@ -146,10 +146,18 @@ def torrent_action(idx, data, mode, ids):
                     return
                 mode.clear_marks()
 
-                wd = data["remove_files"]
+                remove_data = data["remove_files"]
-                for tid in ids:
+
-                    log.debug("Removing torrent: %s, %d", tid, wd)
+                def on_removed_finished(errors):
-                    client.core.remove_torrent(tid, wd).addErrback(action_error, mode)
+                    if errors:
+                        error_msgs = ""
+                        for t_id, e_msg in errors:
+                            error_msgs += "Error removing torrent %s : %s\n" % (t_id, e_msg)
+                        mode.report_message("Error(s) occured when trying to delete torrent(s).", error_msgs)
+                        mode.refresh()
+
+                d = client.core.remove_torrents(ids, remove_data)
+                d.addCallback(on_removed_finished)
 
             def got_status(status):
                 return (status["name"], status["state"])

deluge/ui/web/js/deluge-all/RemoveWindow.js

@@ -58,16 +58,16 @@ Deluge.RemoveWindow = Ext.extend(Ext.Window, {
     },
 
     remove: function(removeData) {
-        Ext.each(this.torrentIds, function(torrentId) {
+        deluge.client.core.remove_torrents(this.torrentIds, removeData, {
-            deluge.client.core.remove_torrent(torrentId, removeData, {
+            success: function(result) {
-                success: function() {
+                if (result) {
-                    this.onRemoved(torrentId);
+                    console.log("Error(s) occured when trying to delete torrent(s).");
+                }
+                this.onRemoved(this.torrentIds);
             },
             scope: this,
-                torrentId: torrentId
+            torrentIds: this.torrentIds
         });
-        }, this);
-        
     },
 
     show: function(ids) {
@@ -88,8 +88,8 @@ Deluge.RemoveWindow = Ext.extend(Ext.Window, {
         this.remove(true);
     },
 
-    onRemoved: function(torrentId) {
+    onRemoved: function(torrentIds) {
-        deluge.events.fire('torrentRemoved', torrentId);
+        deluge.events.fire('torrentsRemoved', torrentIds);
         this.hide();
         deluge.ui.update();
     }

deluge/ui/web/js/deluge-all/TorrentGrid.js

@@ -347,7 +347,7 @@
 
     initComponent: function() {
         Deluge.TorrentGrid.superclass.initComponent.call(this);
-        deluge.events.on('torrentRemoved', this.onTorrentRemoved, this);
+        deluge.events.on('torrentsRemoved', this.onTorrentsRemoved, this);
         deluge.events.on('disconnect', this.onDisconnect, this);
 
         this.on('rowcontextmenu', function(grid, rowIndex, e) {
@@ -459,7 +459,7 @@
     },
 
     // private
-    onTorrentRemoved: function(torrentIds) {
+    onTorrentsRemoved: function(torrentIds) {
         var selModel = this.getSelectionModel();
         Ext.each(torrentIds, function(torrentId) {
             var record = this.getStore().getById(torrentId);