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

Pylint cleanup for ddrescue-tui part 4

Browse source
This commit is contained in:
2Shirt 2019-05-13 20:39:38 -06:00
parent 6a5bba5ed3
commit eed455e3bb
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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