Use image file instead of loopback device
* Still setup loopback for image details but use image directly in ddrescue * Adjusted outer/side panes to use image path instead of loopback dev
This commit is contained in:
parent
29266f1611
commit
de8f3bbd2b
1 changed files with 6 additions and 5 deletions
|
|
@ -393,16 +393,17 @@ def select_device(description='device', provided_path=None,
|
||||||
|
|
||||||
# Set display name
|
# Set display name
|
||||||
if dev['Is Image']:
|
if dev['Is Image']:
|
||||||
dev['Display Name'] = '{name} {size} ({image_name})'.format(
|
dev['Display Name'] = dev['Path']
|
||||||
image_name = dev['Path'][dev['Path'].rfind('/')+1:],
|
|
||||||
**dev['Details'])
|
|
||||||
else:
|
else:
|
||||||
dev['Display Name'] = '{name} {size} {model}'.format(
|
dev['Display Name'] = '{name} {size} {model}'.format(
|
||||||
**dev['Details'])
|
**dev['Details'])
|
||||||
result = run_program(['tput', 'cols'])
|
result = run_program(['tput', 'cols'])
|
||||||
width = int((int(result.stdout.decode().strip()) - 21) / 2) - 2
|
width = int((int(result.stdout.decode().strip()) - 21) / 2) - 2
|
||||||
if len(dev['Display Name']) > width:
|
if len(dev['Display Name']) > width:
|
||||||
dev['Display Name'] = '{}...'.format(dev['Display Name'][:(width-3)])
|
if dev['Is Image']:
|
||||||
|
dev['Display Name'] = '...{}'.format(dev['Display Name'][-(width-3):])
|
||||||
|
else:
|
||||||
|
dev['Display Name'] = '{}...'.format(dev['Display Name'][:(width-3)])
|
||||||
else:
|
else:
|
||||||
dev['Display Name'] = dev['Display Name']
|
dev['Display Name'] = dev['Display Name']
|
||||||
|
|
||||||
|
|
@ -502,7 +503,7 @@ def update_progress(source):
|
||||||
# Main device
|
# Main device
|
||||||
if source['Type'] == 'Clone':
|
if source['Type'] == 'Clone':
|
||||||
output.append('{BLUE}{dev}{CLEAR}'.format(
|
output.append('{BLUE}{dev}{CLEAR}'.format(
|
||||||
dev = source['Dev Path'],
|
dev = 'Image File' if source['Is Image'] else source['Dev Path'],
|
||||||
**COLORS))
|
**COLORS))
|
||||||
for x in (1, 2, 3):
|
for x in (1, 2, 3):
|
||||||
p_num = 'Pass {}'.format(x)
|
p_num = 'Pass {}'.format(x)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue