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

Move file hashing to separate funcion to allow easier extension

Browse source
This commit is contained in:
shortcutme 2017-07-13 14:58:16 +02:00
parent 6bf3d34c6c
commit 1bb3140f5b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Content/ContentManager.py
View file

@ -464,6 +464,19 @@ class ContentManager(object):
self.site.storage.delete(file_inner_path + "-old") self.site.storage.delete(file_inner_path + "-old")
return diffs return diffs
def hashFile(self, dir_inner_path, file_relative_path, optional=False):
back = {}
file_inner_path = dir_inner_path + "/" + file_relative_path
file_path = self.site.storage.getPath(file_inner_path)
file_size = os.path.getsize(file_path)
sha512sum = CryptHash.sha512sum(file_path) # Calculate sha512 sum of file
if optional and not self.hashfield.hasHash(sha512sum):
self.optionalDownloaded(file_inner_path, sha512sum, file_size, own=True)
back[file_relative_path] = {"sha512": sha512sum, "size": os.path.getsize(file_path)}
return back
# Hash files in directory # Hash files in directory
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 = {}
@ -491,18 +504,16 @@ class ContentManager(object):
if ignored: # Ignore content.json, defined regexp and files starting with . if ignored: # Ignore content.json, defined regexp and files starting with .
self.log.info("- [SKIPPED] %s" % file_relative_path) self.log.info("- [SKIPPED] %s" % file_relative_path)
else: else:
file_inner_path = dir_inner_path + "/" + file_relative_path
file_path = self.site.storage.getPath(file_inner_path)
sha512sum = CryptHash.sha512sum(file_path) # Calculate sha512 sum of file
if optional: if optional:
self.log.info("- [OPTIONAL] %s (SHA512: %s)" % (file_relative_path, sha512sum)) self.log.info("- [OPTIONAL] %s" % file_relative_path)
file_size = os.path.getsize(file_path) files_optional_node.update(
files_optional_node[file_relative_path] = {"sha512": sha512sum, "size": file_size} self.hashFile(dir_inner_path, file_relative_path, optional=True)
if not self.hashfield.hasHash(sha512sum): )
self.optionalDownloaded(file_inner_path, sha512sum, file_size, own=True)
else: else:
self.log.info("- %s (SHA512: %s)" % (file_relative_path, sha512sum)) self.log.info("- %s" % file_relative_path)
files_node[file_relative_path] = {"sha512": sha512sum, "size": os.path.getsize(file_path)} files_node.update(
self.hashFile(dir_inner_path, file_relative_path)
)
return files_node, files_optional_node return files_node, files_optional_node
# Create and sign a content.json # Create and sign a content.json