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

Don't hide source dev when selecting dest dev

Browse source 
* Disable the entry instead
* It's more clear what's being done
This commit is contained in:
2Shirt 2018-07-19 00:43:41 -06:00
parent 7597394d61
commit 016f87b76c
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -524,9 +524,8 @@ def menu_select_device(title='Which device?', skip_device={}):
# Build menu # Build menu
dev_options = [] dev_options = []
for dev in json_data['blockdevices']: for dev in json_data['blockdevices']:
# Skip if dev is in skip_names # Disable dev if in skip_names
if dev['name'] in skip_names or dev['pkname'] in skip_names: disable_dev = dev['name'] in skip_names or dev['pkname'] in skip_names
continue
# Append non-matching devices # Append non-matching devices
dev_options.append({ dev_options.append({
@ -536,7 +535,8 @@ def menu_select_device(title='Which device?', skip_device={}):
size = dev['size'] if dev['size'] else '', size = dev['size'] if dev['size'] else '',
model = dev['model'] if dev['model'] else '', model = dev['model'] if dev['model'] else '',
serial = dev['serial'] if dev['serial'] else ''), serial = dev['serial'] if dev['serial'] else ''),
'Path': dev['name']}) 'Path': dev['name'],
'Disabled': disable_dev})
dev_options = sorted(dev_options, key=itemgetter('Name')) dev_options = sorted(dev_options, key=itemgetter('Name'))
if not dev_options: if not dev_options:
print_error('No devices available.') print_error('No devices available.')
@ -547,7 +547,8 @@ def menu_select_device(title='Which device?', skip_device={}):
selection = menu_select( selection = menu_select(
title = title, title = title,
main_entries = dev_options, main_entries = dev_options,
action_entries = actions) action_entries = actions,
disabled_label = 'SOURCE DEVICE')
if selection.isnumeric(): if selection.isnumeric():
return dev_options[int(selection)-1]['Path'] return dev_options[int(selection)-1]['Path']
@ -741,6 +742,7 @@ def run_ddrescue(source, dest, settings):
print_info('Current dev: {}'.format(s_dev['Dev Path'])) print_info('Current dev: {}'.format(s_dev['Dev Path']))
ddrescue_proc = popen_program(['./__choose_exit', *cmd]) ddrescue_proc = popen_program(['./__choose_exit', *cmd])
#ddrescue_proc = popen_program(['./__exit_ok', *cmd]) #ddrescue_proc = popen_program(['./__exit_ok', *cmd])
#ddrescue_proc = popen_program(cmd)
ddrescue_proc.wait() ddrescue_proc.wait()
except KeyboardInterrupt: except KeyboardInterrupt:
# Catch user abort # Catch user abort