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

Get accurate size from ddrescuelog

Browse source 
* Reported size is off by one sector in some cases
This commit is contained in:
2Shirt 2020-01-03 17:25:12 -07:00
parent eb702577ae
commit 6eaf5c2bc2
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,8 @@ CLONE_SETTINGS = {
DDRESCUE_LOG_REGEX = re.compile( DDRESCUE_LOG_REGEX = re.compile(
r'^\s*(?P<key>\S+):\s+' r'^\s*(?P<key>\S+):\s+'
r'(?P<size>\d+)\s+' r'(?P<size>\d+)\s+'
r'(?P<unit>[PTGMKB]i?B?)', r'(?P<unit>[PTGMKB]i?B?)'
r'.*\(\s*(?P<percent>\d+\.?\d*)%\)$',
re.IGNORECASE, re.IGNORECASE,
) )
REGEX_REMAINING_TIME = re.compile( REGEX_REMAINING_TIME = re.compile(
@ -187,9 +188,13 @@ class BlockPair():
for line in proc.stdout.splitlines(): for line in proc.stdout.splitlines():
_r = DDRESCUE_LOG_REGEX.search(line) _r = DDRESCUE_LOG_REGEX.search(line)
if _r: if _r:
data[_r.group('key')] = std.string_to_bytes( if _r.group('key') == 'rescued' and _r.group('percent') == '100':
f'{_r.group("size")} {_r.group("unit")}', # Fix rounding errors from ddrescuelog output
) data['rescued'] = self.size
else:
data[_r.group('key')] = std.string_to_bytes(
f'{_r.group("size")} {_r.group("unit")}',
)
data['pass completed'] = 'current status: finished' in line.lower() data['pass completed'] = 'current status: finished' in line.lower()
# Check if 100% done # Check if 100% done
@ -1302,6 +1307,7 @@ def format_status_string(status, width):
status_str = f'{percent:{width-2}.2f} %' status_str = f'{percent:{width-2}.2f} %'
if '100.00' in status_str and percent < 100: if '100.00' in status_str and percent < 100:
# Always round down to 99.99% # Always round down to 99.99%
LOG.warning('Rounding down to 99.99 from %s', percent)
status_str = f'{"99.99 %":>{width}}' status_str = f'{"99.99 %":>{width}}'
else: else:
# Text # Text