2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Updated run_sfc_scan()

Browse source 
* Output is UTF-16, decode it as such
  * Simplifies section
* Reworked checking the result
  * Use separate exceptions for corruption and general errors
This commit is contained in:
2Shirt 2019-09-22 21:50:08 -07:00
parent 972cb6fb66
commit 2ea0b4818a
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/wk/os/win.py
View file

@ -4,7 +4,6 @@
import logging import logging
import os import os
import pathlib import pathlib
import re
import time import time
from wk import cfg from wk import cfg
@ -120,28 +119,28 @@ def run_sfc_scan():
err_path = log_path.with_suffix('.err') err_path = log_path.with_suffix('.err')
# Run SFC # Run SFC
proc = run_program(cmd, check=False) proc = run_program(cmd, check=False, encoding='utf-16')
# Fix paths # Fix paths
log_path = non_clobber_path(log_path) log_path = non_clobber_path(log_path)
err_path = non_clobber_path(err_path) err_path = non_clobber_path(err_path)
# Save output # Save output
output = proc.stdout.replace('\0', '')
errors = proc.stderr.replace('\0', '')
os.makedirs(log_path.parent, exist_ok=True) os.makedirs(log_path.parent, exist_ok=True)
with open(log_path, 'w') as _f: with open(log_path, 'w') as _f:
_f.write(output) _f.write(proc.stdout)
with open(err_path, 'w') as _f: with open(err_path, 'w') as _f:
_f.write(errors) _f.write(proc.stderr)
# Check result # Check result
if re.findall(r'did\s+not\s+find\s+any\s+integrity\s+violations', output): if 'did not find any integrity violations' in proc.stdout:
pass pass
elif re.findall(r'successfully\s+repaired\s+them', output): elif 'successfully repaired' in proc.stdout:
raise GenericWarning('Repaired') raise GenericWarning('Repaired')
elif 'found corrupt files' in proc.stdout:
raise GenericError('Corruption detected')
else: else:
raise GenericError raise OSError
if __name__ == '__main__': if __name__ == '__main__':