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

Fix function order

Browse source
This commit is contained in:
2Shirt 2018-07-21 20:31:39 -06:00
parent d7dfb34b02
commit 6b28444c36
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,47 @@ def build_outer_panes(source, dest):
'watch', '--color', '--no-title', '--interval', '1',
'cat', source['Progress Out'])
def check_dest_paths(source):
"""Check for image and/or map file and alert user about details."""
dd_image_exists = os.path.exists(source['Dest Paths']['Image'])
map_exists = os.path.exists(source['Dest Paths']['Map'])
if 'Clone' in source['Dest Paths']['Map']:
if map_exists:
# We're cloning and a matching map file was detected
if not ask('Matching map file detected, resume recovery?'):
abort_ddrescue_tui()
else:
abort_imaging = False
resume_files_exist = False
source_devs = [source]
if source['Children']:
source_devs = source['Children']
for dev in source_devs:
# We're imaging
dd_image_exists = os.path.exists(dev['Dest Paths']['Image'])
map_exists = os.path.exists(dev['Dest Paths']['Map'])
if dd_image_exists and not map_exists:
# Refuce to resume without map file
i = dev['Dest Paths']['Image']
i = i[i.rfind('/')+1:]
print_error(
'Detected image "{}" but not the matching map'.format(i))
abort_imaging = True
elif not dd_image_exists and map_exists:
# Can't resume without dd_image
m = dev['Dest Paths']['Map']
m = m[m.rfind('/')+1:]
print_error(
'Detected map "{}" but not the matching image'.format(m))
abort_imaging = True
elif dd_image_exists and map_exists:
# Matching dd_image and map file were detected
resume_files_exist = True
p = 'Matching image and map file{} detected, resume recovery?'.format(
's' if len(source_devs) > 1 else '')
if abort_imaging or (resume_files_exist and not ask(p)):
abort_ddrescue_tui()
def dest_safety_check(source, dest):
"""Verify the destination is appropriate for the source."""
source_size = source['Details']['size']
@ -870,47 +911,6 @@ def select_device(description='device', provided_path=None,
return dev
def check_dest_paths(source):
"""Check for image and/or map file and alert user about details."""
dd_image_exists = os.path.exists(source['Dest Paths']['Image'])
map_exists = os.path.exists(source['Dest Paths']['Map'])
if 'Clone' in source['Dest Paths']['Map']:
if map_exists:
# We're cloning and a matching map file was detected
if not ask('Matching map file detected, resume recovery?'):
abort_ddrescue_tui()
else:
abort_imaging = False
resume_files_exist = False
source_devs = [source]
if source['Children']:
source_devs = source['Children']
for dev in source_devs:
# We're imaging
dd_image_exists = os.path.exists(dev['Dest Paths']['Image'])
map_exists = os.path.exists(dev['Dest Paths']['Map'])
if dd_image_exists and not map_exists:
# Refuce to resume without map file
i = dev['Dest Paths']['Image']
i = i[i.rfind('/')+1:]
print_error(
'Detected image "{}" but not the matching map'.format(i))
abort_imaging = True
elif not dd_image_exists and map_exists:
# Can't resume without dd_image
m = dev['Dest Paths']['Map']
m = m[m.rfind('/')+1:]
print_error(
'Detected map "{}" but not the matching image'.format(m))
abort_imaging = True
elif dd_image_exists and map_exists:
# Matching dd_image and map file were detected
resume_files_exist = True
p = 'Matching image and map file{} detected, resume recovery?'.format(
's' if len(source_devs) > 1 else '')
if abort_imaging or (resume_files_exist and not ask(p)):
abort_ddrescue_tui()
def set_dest_image_paths(source, dest):
"""Set destination image path for source and any child devices."""
if source['Type'] == 'Clone':