diff --git a/.bin/Scripts/functions/ddrescue.py b/.bin/Scripts/functions/ddrescue.py index 4e9376a3..09de8388 100644 --- a/.bin/Scripts/functions/ddrescue.py +++ b/.bin/Scripts/functions/ddrescue.py @@ -349,15 +349,15 @@ class RecoveryState(): def current_pass_done(self): """Checks if pass is done for all block-pairs, returns bool.""" done = True - for b_p in self.block_pairs: - done &= b_p.pass_done[self.current_pass] + for b_pair in self.block_pairs: + done &= b_pair.pass_done[self.current_pass] return done def current_pass_min(self): """Gets minimum pass rescued percentage, returns float.""" min_percent = 100 - for b_p in self.block_pairs: - min_percent = min(min_percent, b_p.rescued_percent) + for b_pair in self.block_pairs: + min_percent = min(min_percent, b_pair.rescued_percent) return min_percent def fix_tmux_panes(self, forced=False): @@ -459,10 +459,10 @@ class RecoveryState(): def retry_all_passes(self): """Mark all passes as pending for all block-pairs.""" self.finished = False - for b_p in self.block_pairs: - b_p.pass_done = [False, False, False] - b_p.status = ['Pending', 'Pending', 'Pending'] - b_p.fix_status_strings() + for b_pair in self.block_pairs: + b_pair.pass_done = [False, False, False] + b_pair.status = ['Pending', 'Pending', 'Pending'] + b_pair.fix_status_strings() self.set_pass_num() def self_checks(self): @@ -494,10 +494,10 @@ class RecoveryState(): # Run BlockPair self checks and get total size self.total_size = 0 - for b_p in self.block_pairs: - b_p.self_check() - self.resumed |= b_p.resumed - self.total_size += b_p.size + for b_pair in self.block_pairs: + b_pair.self_check() + self.resumed |= b_pair.resumed + self.total_size += b_pair.size def set_pass_num(self): """Set current pass based on all block-pair's progress.""" @@ -505,8 +505,8 @@ class RecoveryState(): for pass_num in (2, 1, 0): # Iterate backwards through passes pass_done = True - for b_p in self.block_pairs: - pass_done &= b_p.pass_done[pass_num] + for b_pair in self.block_pairs: + pass_done &= b_pair.pass_done[pass_num] if pass_done: # All block-pairs reported being done # Set to next pass, unless we're on the last pass (2) @@ -589,8 +589,8 @@ class RecoveryState(): # pylint: disable=attribute-defined-outside-init """Update overall progress using block_pairs.""" self.rescued = 0 - for b_p in self.block_pairs: - self.rescued += b_p.rescued + for b_pair in self.block_pairs: + self.rescued += b_pair.rescued self.rescued_percent = (self.rescued / self.total_size) * 100 self.status_percent = get_formatted_status( label='Recovered:', data=self.rescued_percent) @@ -1040,8 +1040,8 @@ def run_ddrescue(state, pass_settings): state.fix_tmux_panes(forced=True) # Run pass for each block-pair - for b_p in state.block_pairs: - if b_p.pass_done[state.current_pass]: + for b_pair in state.block_pairs: + if b_pair.pass_done[state.current_pass]: # Skip to next block-pair continue update_sidepane(state) @@ -1049,7 +1049,7 @@ def run_ddrescue(state, pass_settings): # Set ddrescue cmd cmd = [ 'ddrescue', *pass_settings, - b_p.source_path, b_p.dest_path, b_p.map_path] + b_pair.source_path, b_pair.dest_path, b_pair.map_path] if state.mode == 'clone': cmd.append('--force') if state.current_pass == 0: @@ -1064,7 +1064,7 @@ def run_ddrescue(state, pass_settings): # Start ddrescue try: clear_screen() - print_info('Current dev: {}'.format(b_p.source_path)) + print_info('Current dev: {}'.format(b_pair.source_path)) ddrescue_proc = popen_program(cmd) i = 0 while True: @@ -1079,7 +1079,7 @@ def run_ddrescue(state, pass_settings): i += 1 # Update progress - b_p.update_progress(state.current_pass) + b_pair.update_progress(state.current_pass) update_sidepane(state) # Fix panes @@ -1089,11 +1089,11 @@ def run_ddrescue(state, pass_settings): try: ddrescue_proc.wait(timeout=1) sleep(2) - b_p.update_progress(state.current_pass) + b_pair.update_progress(state.current_pass) update_sidepane(state) break except subprocess.TimeoutExpired: - # Catch to update smart/b_p/sidepane + # Catch to update smart/b_pair/sidepane pass except KeyboardInterrupt: @@ -1102,7 +1102,7 @@ def run_ddrescue(state, pass_settings): ddrescue_proc.wait(timeout=10) # Update progress/sidepane again - b_p.update_progress(state.current_pass) + b_pair.update_progress(state.current_pass) update_sidepane(state) # Was ddrescue aborted? @@ -1124,7 +1124,7 @@ def run_ddrescue(state, pass_settings): break else: # Mark pass finished - b_p.finish_pass(state.current_pass) + b_pair.finish_pass(state.current_pass) update_sidepane(state) # Done @@ -1203,12 +1203,12 @@ def select_parts(source_device): raise GenericAbort() # Build list of selected parts - for d_o in dev_options: - if d_o['Selected']: - d_o['Dev'].model = source_device.model - d_o['Dev'].model_size = source_device.model_size - d_o['Dev'].update_filename_prefix() - selected_parts.append(d_o['Dev']) + for _d in dev_options: + if _d['Selected']: + _d['Dev'].model = source_device.model + _d['Dev'].model_size = source_device.model_size + _d['Dev'].update_filename_prefix() + selected_parts.append(_d['Dev']) return selected_parts @@ -1405,14 +1405,14 @@ def update_sidepane(state): output.append('─────────────────────') # Source(s) progress - for b_p in state.block_pairs: + for b_pair in state.block_pairs: if state.source.is_image(): output.append('{BLUE}Image File{CLEAR}'.format(**COLORS)) else: output.append('{BLUE}{source}{CLEAR}'.format( - source=b_p.source_path, + source=b_pair.source_path, **COLORS)) - output.extend(b_p.status) + output.extend(b_pair.status) output.append(' ') # EToC