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

Fixed aborting when multiple parts selected

Browse source
This commit is contained in:
2Shirt 2020-01-04 15:41:15 -07:00
parent e6e51498dd
commit a68e52322c
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/wk/hw/ddrescue.py
View file

@ -1713,8 +1713,10 @@ def run_ddrescue(state, block_pair, pass_name, settings, dry_run=True):
# Check if complete # Check if complete
try: try:
proc.wait(timeout=1) proc.wait(timeout=1)
break
except KeyboardInterrupt: except KeyboardInterrupt:
# Wait a bit to let ddrescue exit safely # Wait a bit to let ddrescue exit safely
LOG.warning('ddrescue stopped by user')
warning_message = 'Aborted' warning_message = 'Aborted'
std.sleep(2) std.sleep(2)
exe.run_program(['sudo', 'kill', str(proc.pid)], check=False) exe.run_program(['sudo', 'kill', str(proc.pid)], check=False)
@ -1747,9 +1749,6 @@ def run_ddrescue(state, block_pair, pass_name, settings, dry_run=True):
if str(proc.poll()) != '0': if str(proc.poll()) != '0':
state.update_progress_pane('NEEDS ATTENTION') state.update_progress_pane('NEEDS ATTENTION')
std.pause('Press Enter to return to main menu...') std.pause('Press Enter to return to main menu...')
# Aborted?
if 'Aborted' in warning_message:
raise std.GenericAbort() raise std.GenericAbort()
@ -1780,20 +1779,22 @@ def run_recovery(state, main_menu, settings_menu, dry_run=True):
# Run pass(es) # Run pass(es)
for pass_name in ('read', 'trim', 'scrape'): for pass_name in ('read', 'trim', 'scrape'):
abort = False
# Skip to next pass (unless retry selected)
if '--retrim' not in settings and state.pass_complete(pass_name): if '--retrim' not in settings and state.pass_complete(pass_name):
# Skip to next pass (unless retry selected)
# NOTE: This bypasses auto_continue # NOTE: This bypasses auto_continue
continue continue
# Run ddrescue # Run ddrescue
for pair in state.block_pairs: for pair in state.block_pairs:
abort = False
if not pair.pass_complete(pass_name): if not pair.pass_complete(pass_name):
attempted_recovery = True attempted_recovery = True
state.mark_started() state.mark_started()
try: try:
run_ddrescue(state, pair, pass_name, settings, dry_run=dry_run) run_ddrescue(state, pair, pass_name, settings, dry_run=dry_run)
except KeyboardInterrupt: except (KeyboardInterrupt, std.GenericAbort):
LOG.warning('User stopped recovery (2)')
abort = True abort = True
break break
@ -1801,6 +1802,7 @@ def run_recovery(state, main_menu, settings_menu, dry_run=True):
all_complete = state.pass_complete(pass_name) all_complete = state.pass_complete(pass_name)
all_above_threshold = state.pass_above_threshold(pass_name) all_above_threshold = state.pass_above_threshold(pass_name)
if abort or not (all_complete and all_above_threshold and auto_continue): if abort or not (all_complete and all_above_threshold and auto_continue):
LOG.warning('Recovery halted')
break break
# Show warning if nothing was done # Show warning if nothing was done
@ -1816,7 +1818,6 @@ def run_recovery(state, main_menu, settings_menu, dry_run=True):
# Done # Done
state.save_debug_reports() state.save_debug_reports()
atexit.unregister(state.save_debug_reports) atexit.unregister(state.save_debug_reports)
std.pause('Press Enter to return to main menu...')
state.update_progress_pane('Idle') state.update_progress_pane('Idle')