oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move file download allowed checking to separate function

Browse source
This commit is contained in:
shortcutme 2017-10-03 15:29:26 +02:00
parent 08b31416f3
commit ad969dcca7
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Site/Site.py
View file

@ -703,6 +703,16 @@ class Site(object):
def pooledNeedFile(self, *args, **kwargs): def pooledNeedFile(self, *args, **kwargs):
return self.needFile(*args, **kwargs) return self.needFile(*args, **kwargs)
def isFileDownloadAllowed(self, inner_path, file_info):
if file_info.get("size", 0) > config.file_size_limit * 1024 * 1024:
self.log.debug(
"File size %s too large: %sMB > %sMB, skipping..." %
(inner_path, file_info.get("size", 0) / 1024 / 1024, config.file_size_limit)
)
return False
else:
return True
def needFileInfo(self, inner_path): def needFileInfo(self, inner_path):
file_info = self.content_manager.getFileInfo(inner_path) file_info = self.content_manager.getFileInfo(inner_path)
if not file_info: if not file_info:
@ -745,11 +755,9 @@ class Site(object):
)) ))
return False return False
self.downloadContent(file_info["content_inner_path"]) self.downloadContent(file_info["content_inner_path"])
if file_info.get("size", 0) > config.file_size_limit * 1024 * 1024:
self.log.debug( if not self.isFileDownloadAllowed(inner_path, file_info):
"File size %s too large: %sMB > %sMB, skipping..." % self.log.debug("%s: Download not allowed" % inner_path)
(inner_path, file_info.get("size", 0) / 1024 / 1024, config.file_size_limit)
)
return False return False
task = self.worker_manager.addTask(inner_path, peer, priority=priority) task = self.worker_manager.addTask(inner_path, peer, priority=priority)