mirrors/legendary
1
0
Fork 0
mirror of https://github.com/derrod/legendary.git synced 2024-12-22 17:55:27 +00:00
Code Issues Projects Releases Wiki Activity

[models/utils] Catch and log exception when opening file fails

Browse source
This commit is contained in:
derrod 2020-05-23 16:55:18 +02:00
parent e9a959e3a7
commit 1ac1875a86
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
legendary/models/game.py
View file

@ -137,3 +137,4 @@ class VerifyResult(Enum):
HASH_MATCH = 0 HASH_MATCH = 0
HASH_MISMATCH = 1 HASH_MISMATCH = 1
FILE_MISSING = 2 FILE_MISSING = 2
OTHER_ERROR = 3

22
legendary/utils/lfs.py
View file

@ -50,16 +50,20 @@ def validate_files(base_path: str, filelist: List[tuple], hash_type='sha1') -> I
yield VerifyResult.FILE_MISSING, file_path, '' yield VerifyResult.FILE_MISSING, file_path, ''
continue continue
with open(full_path, 'rb') as f: try:
real_file_hash = hashlib.new(hash_type) with open(full_path, 'rb') as f:
while chunk := f.read(8192): real_file_hash = hashlib.new(hash_type)
real_file_hash.update(chunk) while chunk := f.read(1024*1024):
real_file_hash.update(chunk)
result_hash = real_file_hash.hexdigest() result_hash = real_file_hash.hexdigest()
if file_hash != result_hash: if file_hash != result_hash:
yield VerifyResult.HASH_MISMATCH, file_path, result_hash yield VerifyResult.HASH_MISMATCH, file_path, result_hash
else: else:
yield VerifyResult.HASH_MATCH, file_path, result_hash yield VerifyResult.HASH_MATCH, file_path, result_hash
except Exception as e:
logger.fatal(f'Could not verify "{file_path}"; opening failed with: {e!r}')
yield VerifyResult.OTHER_ERROR, file_path, ''
def clean_filename(filename): def clean_filename(filename):