codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-13 13:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only pause torrents when importing blocklist on startup

Browse Source
This commit is contained in:
John Garland 2010-04-12 20:42:37 +10:00
parent 0ae609c6df
commit 047bdf9e3e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deluge/plugins/blocklist/blocklist/core.py
View File

@ -94,6 +94,7 @@ class Core(CorePluginBase):
update_now = False update_now = False
if self.config["load_on_start"]: if self.config["load_on_start"]:
self.pause_transfers()
if self.config["last_update"]: if self.config["last_update"]:
last_update = datetime.fromtimestamp(self.config["last_update"]) last_update = datetime.fromtimestamp(self.config["last_update"])
check_period = timedelta(days=self.config["check_after_days"]) check_period = timedelta(days=self.config["check_after_days"])
@ -102,6 +103,7 @@ class Core(CorePluginBase):
else: else:
d = self.import_list(deluge.configmanager.get_config_dir("blocklist.cache")) d = self.import_list(deluge.configmanager.get_config_dir("blocklist.cache"))
d.addCallbacks(self.on_import_complete, self.on_import_error) 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 # This function is called every 'check_after_days' days, to download
# and import a new list if needed. # and import a new list if needed.
@ -147,6 +149,7 @@ class Core(CorePluginBase):
else: else:
d = self.import_list(self.config["url"]) d = self.import_list(self.config["url"])
d.addCallbacks(self.on_import_complete, self.on_import_error) d.addCallbacks(self.on_import_complete, self.on_import_error)
d.addBoth(self.resume_transfers)
return d return d
@ -323,7 +326,6 @@ class Core(CorePluginBase):
log.debug("Latest blocklist is already imported") log.debug("Latest blocklist is already imported")
return defer.succeed(blocklist) return defer.succeed(blocklist)
self.pause_transfers()
self.is_importing = True self.is_importing = True
self.num_blocked = 0 self.num_blocked = 0
self.blocklist = self.core.session.get_ip_filter() self.blocklist = self.core.session.get_ip_filter()
@ -363,7 +365,6 @@ class Core(CorePluginBase):
else: else:
log.debug("Copying %s to %s", blocklist, cache) log.debug("Copying %s to %s", blocklist, cache)
d = threads.deferToThread(shutil.copy, blocklist, cache) d = threads.deferToThread(shutil.copy, blocklist, cache)
self.resume_transfers()
return d return d
def on_import_error(self, f): def on_import_error(self, f):
@ -396,8 +397,6 @@ class Core(CorePluginBase):
if try_again: if try_again:
d = self.import_list(blocklist) d = self.import_list(blocklist)
d.addCallbacks(self.on_import_complete, self.on_import_error) d.addCallbacks(self.on_import_complete, self.on_import_error)
else:
self.resume_transfers()
return d return d
@ -423,6 +422,8 @@ class Core(CorePluginBase):
if not self.session_was_paused: if not self.session_was_paused:
self.core.session.pause() self.core.session.pause()
def resume_transfers(self): def resume_transfers(self, result):
if not self.session_was_paused: if not self.session_was_paused:
self.session_was_paused = True
self.core.session.resume() self.core.session.resume()
return result