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

Move needFileInfo to separate function

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

21
src/Site/Site.py
View file

@ -703,6 +703,17 @@ class Site(object):
def pooledNeedFile(self, *args, **kwargs): def pooledNeedFile(self, *args, **kwargs):
return self.needFile(*args, **kwargs) return self.needFile(*args, **kwargs)
def needFileInfo(self, inner_path):
file_info = self.content_manager.getFileInfo(inner_path)
if not file_info:
# No info for file, download all content.json first
self.log.debug("No info for %s, waiting for all content.json" % inner_path)
success = self.downloadContent("content.json", download_files=False)
if not success:
return False
file_info = self.content_manager.getFileInfo(inner_path)
return file_info
# Check and download if file not exist # Check and download if file not exist
def needFile(self, inner_path, update=False, blocking=True, peer=None, priority=0): def needFile(self, inner_path, update=False, blocking=True, peer=None, priority=0):
if self.storage.isFile(inner_path) and not update: # File exist, no need to do anything if self.storage.isFile(inner_path) and not update: # File exist, no need to do anything
@ -721,17 +732,11 @@ class Site(object):
if not self.content_manager.contents.get("content.json"): if not self.content_manager.contents.get("content.json"):
return False # Content.json download failed return False # Content.json download failed
file_info = None
if not inner_path.endswith("content.json"): if not inner_path.endswith("content.json"):
file_info = self.content_manager.getFileInfo(inner_path) file_info = self.needFileInfo(inner_path)
if not file_info: if not file_info:
# No info for file, download all content.json first
self.log.debug("No info for %s, waiting for all content.json" % inner_path)
success = self.downloadContent("content.json", download_files=False)
if not success:
return False return False
file_info = self.content_manager.getFileInfo(inner_path)
if not file_info:
return False # Still no info for file
if "cert_signers" in file_info and not file_info["content_inner_path"] in self.content_manager.contents: if "cert_signers" in file_info and not file_info["content_inner_path"] in self.content_manager.contents:
self.log.debug("Missing content.json for requested user file: %s" % inner_path) self.log.debug("Missing content.json for requested user file: %s" % inner_path)
if self.bad_files.get(file_info["content_inner_path"], 0) > 5: if self.bad_files.get(file_info["content_inner_path"], 0) > 5: