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

Adjusted confirm/show details order

Browse source
This commit is contained in:
2Shirt 2018-07-20 13:57:55 -06:00
parent 93c9b206d9
commit 281607f3e4
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -261,6 +261,7 @@ def menu_clone(source_path, dest_path):
# Show selection details # Show selection details
show_selection_details(source, dest) show_selection_details(source, dest)
set_dest_image_paths(source, dest) set_dest_image_paths(source, dest)
check_dest_paths(source)
# Confirm # Confirm
if not ask('Proceed with clone?'): if not ask('Proceed with clone?'):
@ -316,6 +317,11 @@ def menu_image(source_path, dest_path):
source['Type'] = 'Image' source['Type'] = 'Image'
dest = select_dest_path(dest_path, skip_device=source['Details']) dest = select_dest_path(dest_path, skip_device=source['Details'])
dest_safety_check(source, dest) dest_safety_check(source, dest)
# Select child device(s)
source['Children'] = menu_select_children(source)
set_dest_image_paths(source, dest)
check_dest_paths(source)
# Show selection details # Show selection details
show_selection_details(source, dest) show_selection_details(source, dest)
@ -323,10 +329,6 @@ def menu_image(source_path, dest_path):
# Confirm # Confirm
if not ask('Proceed with imaging?'): if not ask('Proceed with imaging?'):
abort_ddrescue_tui() abort_ddrescue_tui()
# Select child device(s)
source['Children'] = menu_select_children(source)
set_dest_image_paths(source, dest)
# Main menu # Main menu
build_outer_panes(source, dest) build_outer_panes(source, dest)
@ -875,10 +877,7 @@ def check_dest_paths(source):
if 'Clone' in source['Dest Paths']['Map']: if 'Clone' in source['Dest Paths']['Map']:
if map_exists: if map_exists:
# We're cloning and a matching map file was detected # We're cloning and a matching map file was detected
if ask('Matching map file detected, resume recovery?'): if not ask('Matching map file detected, resume recovery?'):
print_success('TODO: ...')
exit_script()
else:
abort_ddrescue_tui() abort_ddrescue_tui()
else: else:
# We're imaging # We're imaging