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

Several blocklist fixes.

This commit is contained in:
John Garland 2009-07-05 18:38:51 +00:00
parent 1b997b2349
commit d8e265011a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,8 +102,6 @@ class Core(CorePluginBase):
self.update_timer.start(self.config["check_after_days"] * 24 * 60 * 60) self.update_timer.start(self.config["check_after_days"] * 24 * 60 * 60)
def disable(self): def disable(self):
log.debug("Reset IP Filter..")
component.get("Core").reset_ip_filter()
self.config.save() self.config.save()
log.debug('Blocklist: Plugin disabled') log.debug('Blocklist: Plugin disabled')
@ -193,7 +191,7 @@ class Core(CorePluginBase):
log.debug("Attempting to download blocklist %s" % url) log.debug("Attempting to download blocklist %s" % url)
log.debug("Sending headers: %s" % headers) log.debug("Sending headers: %s" % headers)
self.is_downloading = True self.is_downloading = True
return download_file(url, deluge.configmanager.get_config_dir("blocklist.download"), headers) return download_file(url, deluge.configmanager.get_config_dir("blocklist.download"), on_retrieve_data, headers)
def on_download_complete(self, result): def on_download_complete(self, result):
"""Runs any download clean up functions""" """Runs any download clean up functions"""
@ -210,7 +208,7 @@ class Core(CorePluginBase):
if f.check(error.PageRedirect): if f.check(error.PageRedirect):
# Handle redirect errors # Handle redirect errors
location = error_msg.split(" to ")[1] location = error_msg.split(" to ")[1]
if "Moved Permanently" in error: if "Moved Permanently" in error_msg:
log.debug("Setting blocklist url to %s" % location) log.debug("Setting blocklist url to %s" % location)
self.config["url"] = location self.config["url"] = location
f.trap(f.type) f.trap(f.type)
@ -227,6 +225,8 @@ class Core(CorePluginBase):
log.warning("Blocklist download failed!") log.warning("Blocklist download failed!")
self.failed_attempts += 1 self.failed_attempts += 1
f.trap(f.type) f.trap(f.type)
else:
log.error(error_msg)
return d return d
def import_list(self, force=False): def import_list(self, force=False):
@ -260,7 +260,7 @@ class Core(CorePluginBase):
blocklist = deluge.configmanager.get_config_dir("blocklist.cache") blocklist = deluge.configmanager.get_config_dir("blocklist.cache")
# If we have a backup and we haven't already used it # If we have a backup and we haven't already used it
if os.path.exists(blocklist) and not self.use_cache: if os.path.exists(blocklist) and not self.use_cache:
e = f.trap(error.Error, IOError, TextException, PGException) e = f.trap(Exception)
log.warning("Error reading blocklist: ", e) log.warning("Error reading blocklist: ", e)
d = self.import_list() d = self.import_list()
d.addCallbacks(on_import_complete, on_import_error) d.addCallbacks(on_import_complete, on_import_error)