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

Use path.size instead of os.path.getsize.

Browse source
This commit is contained in:
voussoir 2021-01-25 14:40:56 -08:00
parent 262580ab41
commit 0b7eda1e36
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
voussoirkit/spinal.py
View file

@ -564,9 +564,10 @@ def hash_file(
path object, bytes ingested so far, bytes total path object, bytes ingested so far, bytes total
''' '''
path = pathclass.Path(path) path = pathclass.Path(path)
path.assert_is_file()
hasher = hash_class() hasher = hash_class()
checked_bytes = 0 checked_bytes = 0
file_size = os.path.getsize(path.absolute_path) file_size = path.size
callback_progress = callback_progress or do_nothing callback_progress = callback_progress or do_nothing
@ -635,16 +636,19 @@ def verify_hash(
**hash_kwargs, **hash_kwargs,
): ):
path = pathclass.Path(path) path = pathclass.Path(path)
path.assert_is_file()
log.debug('Validating hash for "%s" against %s.', path.absolute_path, known_hash) log.debug('Validating hash for "%s" against %s.', path.absolute_path, known_hash)
if known_size is not None: if known_size is not None:
file_size = os.path.getsize(path.absolute_path) file_size = path.size
if file_size != known_size: if file_size != known_size:
raise ValidationError(f'File size {file_size} != known size {known_size}.') raise ValidationError(f'File size {file_size} != known size {known_size}.')
file_hash = hash_file(path, hash_class=hash_class, **hash_kwargs).hexdigest() file_hash = hash_file(path, hash_class=hash_class, **hash_kwargs).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}".')
log.debug('Hash validation passed.') log.debug('Hash validation passed.')
def walk_generator( def walk_generator(