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

Show CHKDSK progress in separate pane under ConEmu

Browse source
This commit is contained in:
2Shirt 2021-04-15 21:16:02 -06:00
parent 943c1e11b9
commit 47b49077da
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/wk/exe.py
View file

@ -130,7 +130,7 @@ def get_json_from_command(cmd, check=True, encoding='utf-8', errors='ignore'):
return json_data
def get_procs(name, exact=True):
def get_procs(name, exact=True, try_again=True):
"""Get process object(s) based on name, returns list of proc objects."""
LOG.debug('name: %s, exact: %s', name, exact)
processes = []
@ -141,6 +141,11 @@ def get_procs(name, exact=True):
if re.search(regex, proc.name(), re.IGNORECASE):
processes.append(proc)
# Try again?
if not processes and try_again:
time.sleep(1)
processes = get_procs(name, exact, try_again=False)
# Done
return processes

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

@ -15,7 +15,7 @@ except ImportError as err:
raise err
from wk.borrowed import acpi
from wk.exe import run_program
from wk.exe import get_procs, run_program
from wk.io import non_clobber_path
from wk.log import format_log_path
from wk.std import GenericError, GenericWarning, sleep
@ -23,6 +23,7 @@ from wk.std import GenericError, GenericWarning, sleep
# STATIC VARIABLES
LOG = logging.getLogger(__name__)
CONEMU = 'ConEmuPID' in os.environ
KNOWN_DATA_TYPES = {
'BINARY': winreg.REG_BINARY,
'DWORD': winreg.REG_DWORD,
@ -316,8 +317,8 @@ def reg_set_value(hive, key, name, data, data_type, option=None):
# Repair Functions
def run_chkdsk_offline():
"""Set filesystem 'dirty bit' to force a CHKDSK during startup."""
cmd = f'fsutil dirty set {os.environ.get("SYSTEMDRIVE")}'
proc = run_program(cmd.split(), check=False)
cmd = ['fsutil', 'dirty', 'set', os.environ.get('SYSTEMDRIVE', 'C:')]
proc = run_program(cmd, check=False)
# Check result
if proc.returncode > 0:
@ -325,37 +326,34 @@ def run_chkdsk_offline():
def run_chkdsk_online():
"""Run CHKDSK in a split window.
"""Run CHKDSK.
NOTE: If run on Windows 8+ online repairs are attempted.
"""
cmd = ['CHKDSK', os.environ.get('SYSTEMDRIVE', 'C:')]
if OS_VERSION >= 8:
cmd.extend(['/scan', '/perf'])
log_path = format_log_path(log_name='CHKDSK', tool=True)
err_path = log_path.with_suffix('.err')
if CONEMU:
cmd.extend(['-new_console:n', '-new_console:s33V'])
retried = False
# Run scan
proc = run_program(cmd, check=False)
if proc.returncode > 1:
run_program(cmd, check=False)
proc = get_procs('chkdsk.exe')[0]
return_code = proc.wait()
if return_code > 1:
# Try again
retried = True
proc = run_program(cmd, check=False)
run_program(cmd, check=False)
proc = get_procs('chkdsk.exe')[0]
return_code = proc.wait()
# Check result
if (proc.returncode == 0 and retried) or proc.returncode == 1:
if (return_code == 0 and retried) or return_code == 1:
raise GenericWarning('Repaired (or manually aborted)')
if proc.returncode > 1:
if return_code > 1:
raise GenericError('Issue(s) detected')
# Save output
os.makedirs(log_path.parent, exist_ok=True)
with open(log_path, 'a') as _f:
_f.write(proc.stdout)
with open(err_path, 'a') as _f:
_f.write(proc.stderr)
def run_sfc_scan():
"""Run SFC and save results."""