Changeset 2cceb3a

Timestamp:

06/28/2011 12:42:26 AM (14 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Children:

b5a0f3

Parents:

6ad3a7

Message:

Update append trackers commit to ignore state file adds

File:

• deluge/core/torrentmanager.py (modified) (1 diff)

deluge/core/torrentmanager.py

@@ -411 +411 @@
 
         # If torrent already exists just append any extra trackers.
-        add_torrent_id = str(add_torrent_params["ti"].info_hash())
-        if add_torrent_id in self.get_torrent_list():
-            log.debug("Torrent (%s) exists, checking for trackers to add...", add_torrent_id)
-            add_torrent_trackers = []
-            for value in add_torrent_params["ti"].trackers():
-                tracker = {}
-                tracker["url"] = value.url
-                tracker["tier"] = value.tier
-                add_torrent_trackers.append(tracker)
-
-            torrent_trackers = {}
-            tracker_list = []
-            for tracker in  self[add_torrent_id].get_status(["trackers"])["trackers"]:
-                torrent_trackers[(tracker["url"])] = tracker
-                tracker_list.append(tracker)
-
-            added_tracker = False
-            for tracker in add_torrent_trackers:
-                if tracker['url'] not in torrent_trackers:
+        if state is None:
+            add_torrent_id = str(add_torrent_params["ti"].info_hash())
+            if add_torrent_id in self.get_torrent_list():
+                log.debug("Torrent (%s) exists, checking for trackers to add...", add_torrent_id)
+                add_torrent_trackers = []
+                for value in add_torrent_params["ti"].trackers():
+                    tracker = {}
+                    tracker["url"] = value.url
+                    tracker["tier"] = value.tier
+                    add_torrent_trackers.append(tracker)
+
+                torrent_trackers = {}
+                tracker_list = []
+                for tracker in  self[add_torrent_id].get_status(["trackers"])["trackers"]:
+                    torrent_trackers[(tracker["url"])] = tracker
                     tracker_list.append(tracker)
-                    added_tracker = True
-
-            if added_tracker:
-                self[add_torrent_id].set_trackers(tracker_list)
-            return
+
+                added_tracker = False
+                for tracker in add_torrent_trackers:
+                    if tracker['url'] not in torrent_trackers:
+                        tracker_list.append(tracker)
+                        added_tracker = True
+
+                if added_tracker:
+                    self[add_torrent_id].set_trackers(tracker_list)
+                return
 
         # We need to pause the AlertManager momentarily to prevent alerts