From b764486bff18ac459c21fbda1da701771910e8de Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Fri, 16 Nov 2007 20:56:50 +0000 Subject: [PATCH] deal with blank trackers in force recheck and between sessions --- src/core.py | 2 ++ src/interface.py | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core.py b/src/core.py index 30d78cae1..3f250c106 100644 --- a/src/core.py +++ b/src/core.py @@ -169,6 +169,7 @@ class torrent_info: self.webseed_urls = [] self.desired_ratio = 1.0 self.trackers = "" + self.trackers_changed = 0 self.delete_me = False # set this to true, to delete it on next sync self.del_data = False # set this to true, to delete data on next sync @@ -1017,6 +1018,7 @@ of HD space! Oops!\nWe had to pause at least one torrent")) def replace_trackers(self, unique_ID, trackerslist): self.unique_IDs[unique_ID].trackers = trackerslist + self.unique_IDs[unique_ID].trackers_changed = 1 try: return deluge_core.replace_trackers(unique_ID, trackerslist) except: diff --git a/src/interface.py b/src/interface.py index 3a5634883..5bdc10810 100644 --- a/src/interface.py +++ b/src/interface.py @@ -170,7 +170,7 @@ class DelugeGTK: self.manager.unique_IDs[unique_ID].initial_uploaded_memory = \ self.manager.unique_IDs[unique_ID].uploaded_memory try: - if self.manager.unique_IDs[unique_ID].trackers: + if self.manager.unique_IDs[unique_ID].trackers_changed: try: self.manager.replace_trackers(unique_ID, \ self.manager.unique_IDs[unique_ID].trackers) @@ -747,11 +747,15 @@ window, please enter your password")) path = self.manager.unique_IDs[uid].filename save_dir = self.manager.unique_IDs[uid].save_dir trackerslist = self.manager.unique_IDs[uid].trackers + try: + trackers_changed = self.manager.unique_IDs[uid].trackers_changed + except AttributeError: + trackers_changed = 0 self.manager.save_upmem() uploaded_memory = self.manager.unique_IDs[uid].uploaded_memory priorities = self.manager.get_priorities(uid) save_info = [path, save_dir, order, trackerslist, \ - uploaded_memory, priorities] + uploaded_memory, priorities, trackers_changed] try: os.remove(self.manager.unique_IDs[uid].filename + ".fastresume") except: @@ -768,7 +772,7 @@ window, please enter your password")) self.manager.unique_IDs[unique_ID].initial_uploaded_memory = \ save_info[4] self.manager.save_upmem() - if save_info[3]: + if save_info[5]: try: self.manager.replace_trackers(unique_ID, save_info[3]) except: