From 7aa52e5f1bdbca433113ed6eab73a1d0c4f89348 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 7 Jul 2014 23:25:57 +0100 Subject: [PATCH] Prevent private flagged torrents auto-merging trackers When adding a torrent already in session any new trackers are merged to the exiting torrent but this is an unwanted feature for private flagged torrents. --- deluge/core/torrentmanager.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py index c762aa000..dda6bc843 100644 --- a/deluge/core/torrentmanager.py +++ b/deluge/core/torrentmanager.py @@ -374,9 +374,14 @@ class TorrentManager(component.Component): # We have a torrent_info object or magnet uri so we're not loading from state. if torrent_info: add_torrent_id = str(torrent_info.info_hash()) + # If this torrent id is already in the session, merge any additional trackers. if add_torrent_id in self.get_torrent_list(): - # Torrent already exists just append any extra trackers. - log.debug("Torrent (%s) exists, checking for trackers to add...", add_torrent_id) + log.info("Merging trackers for torrent (%s) already in session...", add_torrent_id) + # Don't merge trackers if either torrent has private flag set + if self[add_torrent_id].get_status(["private"])["private"]: + log.info("Merging trackers abandoned: Torrent has private flag set.") + return + add_torrent_trackers = [] for value in torrent_info.trackers(): tracker = {} @@ -390,13 +395,14 @@ class TorrentManager(component.Component): torrent_trackers[(tracker["url"])] = tracker tracker_list.append(tracker) - added_tracker = False + added_tracker = 0 for tracker in add_torrent_trackers: if tracker['url'] not in torrent_trackers: tracker_list.append(tracker) - added_tracker = True + added_tracker += 1 if added_tracker: + log.info("%s tracker(s) merged into torrent.", added_tracker) self[add_torrent_id].set_trackers(tracker_list) return