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

[cli] Accurately track verified file size

Browse source
This commit is contained in:
derrod 2022-01-04 12:11:46 +01:00
parent ecb04324d5
commit bec119bc03
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
legendary/cli.py
View file

@ -1111,6 +1111,7 @@ class LegendaryCLI:
for fm in file_list) for fm in file_list)
num = processed = last_processed = 0 num = processed = last_processed = 0
speed = 0.0 speed = 0.0
percentage = 0.0
failed = [] failed = []
missing = [] missing = []
@ -1118,8 +1119,8 @@ class LegendaryCLI:
logger.info(f'Verifying "{igame.title}" version "{manifest.meta.build_version}"') logger.info(f'Verifying "{igame.title}" version "{manifest.meta.build_version}"')
repair_file = [] repair_file = []
for result, path, result_hash in validate_files(igame.install_path, file_list): for result, path, result_hash, bytes_read in validate_files(igame.install_path, file_list):
processed += manifest.file_manifest_list.get_file_by_path(path).file_size processed += bytes_read
percentage = (processed / total_size) * 100.0 percentage = (processed / total_size) * 100.0
num += 1 num += 1
@ -1145,7 +1146,7 @@ class LegendaryCLI:
logger.error(f'Other failure (see log), treating file as missing: "{path}"') logger.error(f'Other failure (see log), treating file as missing: "{path}"')
missing.append(path) missing.append(path)
stdout.write(f'Verification progress: {num}/{total} ({num * 100 / total:.01f}%) [{speed:.1f} MiB/s]\t\n') stdout.write(f'Verification progress: {num}/{total} ({percentage:.01f}%) [{speed:.1f} MiB/s]\t\n')
# always write repair file, even if all match # always write repair file, even if all match
if repair_file: if repair_file:

10
legendary/utils/lfs.py
View file

@ -86,7 +86,7 @@ def validate_files(base_path: str, filelist: List[tuple], hash_type='sha1',
:param filelist: list of tuples in format (path, hash [hex]) :param filelist: list of tuples in format (path, hash [hex])
:param hash_type: (optional) type of hash, default is sha1 :param hash_type: (optional) type of hash, default is sha1
:param large_file_threshold: (optional) threshold for large files, default is 512 MiB :param large_file_threshold: (optional) threshold for large files, default is 512 MiB
:return: yields tuples in format (VerifyResult, path, hash [hex]) :return: yields tuples in format (VerifyResult, path, hash [hex], bytes read)
""" """
if not filelist: if not filelist:
@ -100,7 +100,7 @@ def validate_files(base_path: str, filelist: List[tuple], hash_type='sha1',
# logger.debug(f'Checking "{file_path}"...') # logger.debug(f'Checking "{file_path}"...')
if not os.path.exists(full_path): if not os.path.exists(full_path):
yield VerifyResult.FILE_MISSING, file_path, '' yield VerifyResult.FILE_MISSING, file_path, '', 0
continue continue
show_progress = False show_progress = False
@ -139,12 +139,12 @@ def validate_files(base_path: str, filelist: List[tuple], hash_type='sha1',
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, f.tell()
else: else:
yield VerifyResult.HASH_MATCH, file_path, result_hash yield VerifyResult.HASH_MATCH, file_path, result_hash, f.tell()
except Exception as e: except Exception as e:
logger.fatal(f'Could not verify "{file_path}"; opening failed with: {e!r}') logger.fatal(f'Could not verify "{file_path}"; opening failed with: {e!r}')
yield VerifyResult.OTHER_ERROR, file_path, '' yield VerifyResult.OTHER_ERROR, file_path, '', 0
def clean_filename(filename): def clean_filename(filename):