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

Avoid get db_inner_path for every file on signing

Browse source
This commit is contained in:
shortcutme 2019-12-17 14:23:18 +01:00
parent 08a0a63631
commit 0171cb0844
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Content/ContentManager.py
View file

@ -615,6 +615,7 @@ class ContentManager(object):
def hashFiles(self, dir_inner_path, ignore_pattern=None, optional_pattern=None): def hashFiles(self, dir_inner_path, ignore_pattern=None, optional_pattern=None):
files_node = {} files_node = {}
files_optional_node = {} files_optional_node = {}
db_inner_path = self.site.storage.getDbFile()
if dir_inner_path and not self.isValidRelativePath(dir_inner_path): if dir_inner_path and not self.isValidRelativePath(dir_inner_path):
ignored = True ignored = True
self.log.error("- [ERROR] Only ascii encoded directories allowed: %s" % dir_inner_path) self.log.error("- [ERROR] Only ascii encoded directories allowed: %s" % dir_inner_path)
@ -630,7 +631,7 @@ class ContentManager(object):
elif not self.isValidRelativePath(file_relative_path): elif not self.isValidRelativePath(file_relative_path):
ignored = True ignored = True
self.log.error("- [ERROR] Invalid filename: %s" % file_relative_path) self.log.error("- [ERROR] Invalid filename: %s" % file_relative_path)
elif dir_inner_path == "" and self.site.storage.getDbFile() and file_relative_path.startswith(self.site.storage.getDbFile()): elif dir_inner_path == "" and db_inner_path and file_relative_path.startswith(db_inner_path):
ignored = True ignored = True
elif optional_pattern and SafeRe.match(optional_pattern, file_relative_path): elif optional_pattern and SafeRe.match(optional_pattern, file_relative_path):
optional = True optional = True