voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let known_size checking of verify_hash be optional.

Browse source
This commit is contained in:
Ethan Dalool 2020-02-18 00:09:15 -08:00
parent df9b829346
commit 1976ccb843
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
voussoirkit/spinal.py
View file

@ -539,7 +539,13 @@ def normalize(text):
''' '''
return os.path.normpath(os.path.normcase(text)) return os.path.normpath(os.path.normcase(text))
def verify_hash(path, known_size, known_hash, callback=None): def verify_hash(
path,
known_hash,
*,
known_size=None,
callback=None,
):
''' '''
callback: callback:
A function that takes three parameters: A function that takes three parameters:
@ -563,6 +569,11 @@ def verify_hash(path, known_size, known_hash, callback=None):
if callback is not None: if callback is not None:
callback(path, checked_bytes, file_size) callback(path, checked_bytes, file_size)
if known_size is not None:
file_size = os.path.getsize(path.absolute_path)
if file_size != known_size:
raise ValidationError(f'File size {file_size} != known size {known_size}.')
file_hash = hasher.hexdigest() file_hash = hasher.hexdigest()
if file_hash != known_hash: if file_hash != known_hash:
raise ValidationError(f'File hash "{file_hash}" != known hash "{known_hash}".') raise ValidationError(f'File hash "{file_hash}" != known hash "{known_hash}".')