Module: deluge Branch: master Commit: 047bdf9e3e24f9554c187777ba60e1fc0d7cbaf3
Author: John Garland <[email protected]> Date: Mon Apr 12 20:42:37 2010 +1000 Only pause torrents when importing blocklist on startup --- deluge/plugins/blocklist/blocklist/core.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deluge/plugins/blocklist/blocklist/core.py b/deluge/plugins/blocklist/blocklist/core.py index a1b7c0c..db93069 100644 --- a/deluge/plugins/blocklist/blocklist/core.py +++ b/deluge/plugins/blocklist/blocklist/core.py @@ -94,6 +94,7 @@ class Core(CorePluginBase): update_now = False if self.config["load_on_start"]: + self.pause_transfers() if self.config["last_update"]: last_update = datetime.fromtimestamp(self.config["last_update"]) check_period = timedelta(days=self.config["check_after_days"]) @@ -102,6 +103,7 @@ class Core(CorePluginBase): else: d = self.import_list(deluge.configmanager.get_config_dir("blocklist.cache")) d.addCallbacks(self.on_import_complete, self.on_import_error) + d.addBoth(self.resume_transfers) # This function is called every 'check_after_days' days, to download # and import a new list if needed. @@ -147,6 +149,7 @@ class Core(CorePluginBase): else: d = self.import_list(self.config["url"]) d.addCallbacks(self.on_import_complete, self.on_import_error) + d.addBoth(self.resume_transfers) return d @@ -323,7 +326,6 @@ class Core(CorePluginBase): log.debug("Latest blocklist is already imported") return defer.succeed(blocklist) - self.pause_transfers() self.is_importing = True self.num_blocked = 0 self.blocklist = self.core.session.get_ip_filter() @@ -363,7 +365,6 @@ class Core(CorePluginBase): else: log.debug("Copying %s to %s", blocklist, cache) d = threads.deferToThread(shutil.copy, blocklist, cache) - self.resume_transfers() return d def on_import_error(self, f): @@ -396,8 +397,6 @@ class Core(CorePluginBase): if try_again: d = self.import_list(blocklist) d.addCallbacks(self.on_import_complete, self.on_import_error) - else: - self.resume_transfers() return d @@ -423,6 +422,8 @@ class Core(CorePluginBase): if not self.session_was_paused: self.core.session.pause() - def resume_transfers(self): + def resume_transfers(self, result): if not self.session_was_paused: + self.session_was_paused = True self.core.session.resume() + return result -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
