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

Adjusted ddrescue TUI results report

Browse source
This commit is contained in:
2Shirt 2020-01-08 20:35:32 -07:00
parent 6e3f02961c
commit 76a9d90ecb
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -594,31 +594,37 @@ class State():
# Header # Header
report.append(f'{self.mode.title()} Results:') report.append(f'{self.mode.title()} Results:')
report.append(' ') report.append(' ')
report.append(f'Source: {self.source.path}') report.append(f'Source: {self.source.description}')
report.append(f'Destination: {self.destination}') if self.mode == 'Clone':
report.append(f'Destination: {self.destination.description}')
else:
report.append(f'Destination: {self.destination}/')
# Overall # Overall
report.append(' ') report.append(' ')
error_size = self.get_error_size() error_size = self.get_error_size()
error_size = std.bytes_to_string(error_size, decimals=2) error_size_str = std.bytes_to_string(error_size, decimals=2)
if error_size > 0:
error_size_str = std.color_string(error_size_str, 'YELLOW')
percent = self.get_percent_recovered() percent = self.get_percent_recovered()
percent = format_status_string(percent, width=0) percent = format_status_string(percent, width=0)
percent = std.strip_colors(percent) report.append(f'Overall rescued: {percent}, error size: {error_size_str}')
report.append(f'Overall rescued: {percent}, error size: {error_size}')
# Block-Pairs # Block-Pairs
if len(self.block_pairs) > 1: if len(self.block_pairs) > 1:
report.append(' ') report.append(' ')
for pair in self.block_pairs: for pair in self.block_pairs:
error_size = pair.get_error_size() error_size = pair.get_error_size()
error_size = std.bytes_to_string(error_size, decimals=2) error_size_str = std.bytes_to_string(error_size, decimals=2)
if error_size > 0:
error_size_str = std.color_string(error_size_str, 'YELLOW')
pair_size = std.bytes_to_string(pair.size, decimals=2) pair_size = std.bytes_to_string(pair.size, decimals=2)
percent = pair.get_percent_recovered() percent = pair.get_percent_recovered()
percent = format_status_string(percent, width=0) percent = format_status_string(percent, width=0)
percent = std.strip_colors(percent)
report.append( report.append(
f'{pair.source.name} ({pair_size}) rescued: ' f'{pair.source.name} ({pair_size}) '
f'{percent}, error size: {error_size}' f'rescued: {percent}, '
f'error size: {error_size_str}'
) )
# Done # Done
@ -1688,9 +1694,8 @@ def main():
break break
# Save results to log # Save results to log
LOG.info(' ') std.print_standard(' ')
for line in state.generate_report(): std.print_report(state.generate_report())
LOG.info(line)
def mount_raw_image(path): def mount_raw_image(path):