Ticket #2474: Replace add_torrent with async_add_torrent.patch

deluge/core/torrentmanager.py

@@ -478 +478 @@
 
         handle = None
         try:
-            handle = self.session.add_torrent(add_torrent_params)
+            handle = self.session.async_add_torrent(async_add_torrent_params)
         except RuntimeError as ex:
             log.warning("Error adding torrent: %s", ex)
 
@@ -1119 +1119 @@
             return
 
         if torrent_id in self.torrents:
-            # Libtorrent in add_torrent() expects resume_data to be bencoded
+            # Libtorrent in async_add_torrent() expects resume_data to be bencoded
             self.resume_data[torrent_id] = lt.bencode(alert.resume_data)
 
         if torrent_id in self.waiting_on_resume_data:

deluge/ui/console/modes/add_util.py

@@ -61 +61 @@
     newpath = newpath.replace(unichr(sentinal),"[]]")
     return newpath
 
-def add_torrent(t_file, options, success_cb, fail_cb, ress):
+def async_add_torrent(t_file, options, success_cb, fail_cb, ress):
     t_options = {}
     if options["path"]:
         t_options["download_location"] = os.path.expanduser(options["path"])

deluge/ui/console/modes/alltorrents.py

@@ -45 +45 @@
 from deluge.ui.sessionproxy import SessionProxy
 
 from popup import Popup, SelectablePopup, MessagePopup, ALIGN
-from add_util import add_torrent
+from add_util import async_add_torrent
 from input_popup import InputPopup, ALIGN
 from torrentdetail import TorrentDetail
 from addtorrents import AddTorrents

deluge/ui/console/modes/torrentdetail.py

@@ -46 +46 @@
 from deluge.ui.sessionproxy import SessionProxy
 
 from popup import Popup,SelectablePopup,MessagePopup
-from add_util import add_torrent
+from add_util import async_add_torrent
 from input_popup import InputPopup
 import deluge.ui.console.colors as colors
 import format_utils

deluge/ui/gtkui/queuedtorrents.py

@@ -172 +172 @@
 
     def on_button_add_clicked(self, widget):
         # Add all the torrents in the liststore
-        def add_torrent(model, path, iter, data):
+        def async_add_torrent(model, path, iter, data):
             torrent_path = model.get_value(iter, 1).decode('utf-8')
             process_args([torrent_path])
 
-        self.liststore.foreach(add_torrent, None)
+        self.liststore.foreach(async_add_torrent, None)
         del self.queue[:]
         self.dialog.hide()
         self.update_status_bar()