From de8f3bbd2b31fa1016260cbf67df8710e15596ce Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 17 Jul 2018 13:21:12 -0600 Subject: [PATCH] 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 --- .bin/Scripts/functions/ddrescue.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.bin/Scripts/functions/ddrescue.py b/.bin/Scripts/functions/ddrescue.py index 691d6169..06e7166b 100644 --- a/.bin/Scripts/functions/ddrescue.py +++ b/.bin/Scripts/functions/ddrescue.py @@ -393,16 +393,17 @@ def select_device(description='device', provided_path=None, # Set display name if dev['Is Image']: - dev['Display Name'] = '{name} {size} ({image_name})'.format( - image_name = dev['Path'][dev['Path'].rfind('/')+1:], - **dev['Details']) + dev['Display Name'] = dev['Path'] else: dev['Display Name'] = '{name} {size} {model}'.format( **dev['Details']) result = run_program(['tput', 'cols']) width = int((int(result.stdout.decode().strip()) - 21) / 2) - 2 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: dev['Display Name'] = dev['Display Name'] @@ -502,7 +503,7 @@ def update_progress(source): # Main device if source['Type'] == 'Clone': output.append('{BLUE}{dev}{CLEAR}'.format( - dev = source['Dev Path'], + dev = 'Image File' if source['Is Image'] else source['Dev Path'], **COLORS)) for x in (1, 2, 3): p_num = 'Pass {}'.format(x)