Module: deluge Branch: master Commit: 35dfcf3a77040f2e2b62d0268e563de39689ab1a
Author: John Garland <[email protected]> Date: Mon Apr 12 00:40:23 2010 +1000 Pause transfers until blocklist is imported (#861) --- ChangeLog | 1 + deluge/plugins/blocklist/blocklist/core.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf4f44e..63883f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ ==== Blocklist ==== * Implement local blocklist support + * #861: Pause transfers until blocklist is imported ==== Web ==== * Migrate to ExtJS 3.1 diff --git a/deluge/plugins/blocklist/blocklist/core.py b/deluge/plugins/blocklist/blocklist/core.py index 8a556ca..a1b7c0c 100644 --- a/deluge/plugins/blocklist/blocklist/core.py +++ b/deluge/plugins/blocklist/blocklist/core.py @@ -323,6 +323,7 @@ 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() @@ -362,6 +363,7 @@ 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): @@ -394,6 +396,8 @@ 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 @@ -413,3 +417,12 @@ class Core(CorePluginBase): raise UnknownFormatError else: self.reader = create_reader(self.config["list_type"], self.config["list_compression"]) + + def pause_transfers(self): + self.session_was_paused = self.core.session.is_paused() + if not self.session_was_paused: + self.core.session.pause() + + def resume_transfers(self): + if not self.session_was_paused: + self.core.session.resume() -- 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.
