codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use better attribute / method names in blocklist

This commit is contained in:
John Garland 2010-09-26 11:36:52 +10:00
parent c029c312e4
commit 40ce4ec731
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ class Core(CorePluginBase):
self.is_importing = False self.is_importing = False
self.has_imported = False self.has_imported = False
self.up_to_date = False self.up_to_date = False
self.session_was_paused = True self.need_to_resume_session = False
self.num_blocked = 0 self.num_blocked = 0
self.file_progress = 0.0 self.file_progress = 0.0
@ -96,7 +96,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() self.pause_session()
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"])
@ -105,7 +105,8 @@ 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) if self.need_to_resume_session:
d.addBoth(self.resume_session)
# 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.
@ -151,7 +152,8 @@ 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) if self.need_to_resume_session:
d.addBoth(self.resume_session)
return d return d
@ -419,13 +421,14 @@ class Core(CorePluginBase):
else: else:
self.reader = create_reader(self.config["list_type"], self.config["list_compression"]) self.reader = create_reader(self.config["list_type"], self.config["list_compression"])
def pause_transfers(self): def pause_session(self):
self.session_was_paused = self.core.session.is_paused() if not self.core.session.is_paused():
if not self.session_was_paused:
self.core.session.pause() self.core.session.pause()
self.need_to_resume_session = True
else:
self.need_to_resume_session = False
def resume_transfers(self, result): def resume_session(self, result):
if not self.session_was_paused: self.core.session.resume()
self.session_was_paused = True self.need_to_resume_session = False
self.core.session.resume()
return result return result