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

Fixed current_pass updates/progression

Browse source
This commit is contained in:
2Shirt 2018-08-16 00:43:09 -07:00
parent 7d30a735fc
commit afaee53077
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.bin/Scripts/functions/ddrescue.py
View file

@ -90,7 +90,7 @@ class BlockPair():
if os.path.exists(self.map_path): if os.path.exists(self.map_path):
self.load_map_data() self.load_map_data()
self.resumed = True self.resumed = True
fix_status_strings() self.fix_status_strings()
def fix_status_strings(self): def fix_status_strings(self):
"""Format status strings via get_formatted_status().""" """Format status strings via get_formatted_status()."""
@ -334,7 +334,7 @@ class RecoveryState():
def retry_all_passes(self): def retry_all_passes(self):
"""Mark all passes as pending for all block-pairs.""" """Mark all passes as pending for all block-pairs."""
self.current_pass = 0 self.finished = False
for bp in self.block_pairs: for bp in self.block_pairs:
bp.pass_done = [False, False, False] bp.pass_done = [False, False, False]
bp.status = ['Pending', 'Pending', 'Pending'] bp.status = ['Pending', 'Pending', 'Pending']
@ -367,11 +367,11 @@ class RecoveryState():
break break
if self.finished: if self.finished:
self.current_pass_str = '- "Done"' self.current_pass_str = '- "Done"'
elif pass_num == 0: elif self.current_pass == 0:
self.current_pass_str = '1 "Initial Read"' self.current_pass_str = '1 "Initial Read"'
elif pass_num == 1: elif self.current_pass == 1:
self.current_pass_str = '2 "Trimming bad areas"' self.current_pass_str = '2 "Trimming bad areas"'
elif pass_num == 2: elif self.current_pass == 2:
self.current_pass_str = '3 "Scraping bad areas"' self.current_pass_str = '3 "Scraping bad areas"'
def update_progress(self): def update_progress(self):
@ -724,6 +724,7 @@ def menu_main(state):
state.started = True state.started = True
run_ddrescue(state, pass_settings) run_ddrescue(state, pass_settings)
if state.finished or not auto_run: if state.finished or not auto_run:
state.set_pass_num()
break break
if state.current_pass_done(): if state.current_pass_done():
if (state.current_pass == 0 and if (state.current_pass == 0 and