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

Fixed regression where blocklist no longer checked for update on startup

This commit is contained in:
John Garland 2009-01-20 13:46:13 +00:00
parent 2403d13ceb
commit 3b9b47011c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,8 +255,14 @@ class Core(CorePluginBase):
if os.path.exists(deluge.configmanager.get_config_dir("blocklist.cache")): if os.path.exists(deluge.configmanager.get_config_dir("blocklist.cache")):
# Check current block lists time stamp and decide if it needs to be replaced # Check current block lists time stamp and decide if it needs to be replaced
list_size = long(os.stat(deluge.configmanager.get_config_dir("blocklist.cache")).st_size) list_stats = os.stat(deluge.configmanager.get_config_dir("blocklist.cache"))
list_size = long(list_stats.st_size)
list_checked = datetime.datetime.fromtimestamp(list_stats.st_mtime)
try:
list_time = datetime.datetime.strptime(self.config["file_date"], "%a %b %d %H:%M:%S %Y") list_time = datetime.datetime.strptime(self.config["file_date"], "%a %b %d %H:%M:%S %Y")
except:
list_time = list_checked
current_time = datetime.datetime.today()
else: else:
log.debug("Blocklist doesn't exist") log.debug("Blocklist doesn't exist")
return True return True
@ -266,8 +272,9 @@ class Core(CorePluginBase):
log.debug("Empty blocklist") log.debug("Empty blocklist")
return True return True
# If blocklist has just started up don't check for updates # If blocklist has just started up, check for updates if over x days
if not self.has_imported: if not self.has_imported and current_time < (list_checked + datetime.timedelta(days=self.config["check_after_days"])):
log.debug("Blocklist doesn't need checking yet")
return False return False
import socket import socket
@ -287,5 +294,7 @@ class Core(CorePluginBase):
log.debug("Newer blocklist exists (%s & %d vs %s & %d)", remote_time, remote_size, list_time, list_size) log.debug("Newer blocklist exists (%s & %d vs %s & %d)", remote_time, remote_size, list_time, list_size)
return True return True
# Update last modified time of blocklist
os.utime(deluge.configmanager.get_config_dir("blocklist.cache"), None)
log.debug("Blocklist is up to date") log.debug("Blocklist is up to date")
return False return False