Changeset b0c3c3

Timestamp:

01/17/2014 10:48:42 AM (12 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

624f2f

Parents:

8eb215

git-author:

Calum Lind <calumlind+deluge@gmail.com> (01/17/2014 10:48:32 AM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (01/17/2014 10:48:42 AM)

Message:

Use non-deprecated libtorrent parameters and functions

Also added support for seed_mode

File:

• deluge/core/torrentmanager.py (modified) (3 diffs)

deluge/core/torrentmanager.py

@@ -316 +316 @@
 
     def add(self, torrent_info=None, state=None, options=None, save_state=True,
-            filedump=None, filename=None, magnet=None, resume_data=None, owner=None):
+            filedump=None, filename=None, magnet=None, resume_data=None, seed_mode=False, owner=None):
         """Add a torrent to the manager and returns it's torrent_id"""
         if torrent_info is None and state is None and filedump is None and magnet is None:
@@ -442 +442 @@
         add_torrent_params["save_path"] = utf8_encoded(options["download_location"])
         add_torrent_params["storage_mode"] = storage_mode
-        add_torrent_params["paused"] = True
-        add_torrent_params["auto_managed"] = False
-        add_torrent_params["duplicate_is_error"] = True
+        add_torrent_params["flags"] = (lt.add_torrent_params_flags_t.flag_paused |
+                                       lt.add_torrent_params_flags_t.flag_duplicate_is_error)
+        if seed_mode:
+            add_torrent_params["flags"] |= lt.add_torrent_params_flags_t.flag_seed_mode
+        if magnet:
+            add_torrent_params["url"] = utf8_encoded(magnet)
 
         # We need to pause the AlertManager momentarily to prevent alerts
@@ -452 +455 @@
         handle = None
         try:
-            if magnet:
-                handle = lt.add_magnet_uri(self.session, utf8_encoded(magnet), add_torrent_params)
-            else:
-                handle = self.session.add_torrent(add_torrent_params)
+            handle = self.session.add_torrent(add_torrent_params)
         except RuntimeError as ex:
             log.warning("Error adding torrent: %s", ex)