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

updated prep_disk_for_backup()

Browse source 
* Partition['Image Path'] is set to the full destination path
  * (i.e. ['Image Path'] + '\\' + ['Image File']
  * Partition['Image File'] variable has been removed
* Simplified ['Backup Warnings'] section
* Added fix_path()
  * Replaces unsupported characters/strings with underscores
This commit is contained in:
Alan Mason 2017-11-30 19:45:59 -08:00
parent 45f0b4d2b1
commit 67f08c5042
3 changed files with 103 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
Scripts/functions/backup.py
View file

@ -2,6 +2,15 @@
from functions.common import * from functions.common import *
# Regex
REGEX_BAD_PARTITION = re.compile(r'(RAW|Unknown)', re.IGNORECASE)
REGEX_BAD_PATH_NAMES = re.compile(
r'([<>:"/\\\|\?\*]'
r'|^(CON|PRN|AUX|NUL|COM\d*|LPT\d*)$)'
r'|^\s+'
r'|[\s\.]+$',
re.IGNORECASE)
def backup_partition(disk, partition): def backup_partition(disk, partition):
if par['Image Exists'] or par['Number'] in disk['Bad Partitions']: if par['Image Exists'] or par['Number'] in disk['Bad Partitions']:
raise GenericAbort raise GenericAbort
@ -10,89 +19,91 @@ def backup_partition(disk, partition):
global_vars['Tools']['wimlib-imagex'], global_vars['Tools']['wimlib-imagex'],
'capture' 'capture'
'{}:\\'.format(par['Letter']), '{}:\\'.format(par['Letter']),
r'{}\{}'.format(par['Image Path'], par['Image File']), par['Image Path'],
par['Image Name'], # Image name par['Image Name'], # Image name
par['Image Name'], # Image description par['Image Name'], # Image description
' --compress=none', ' --compress=none',
] ]
os.makedirs(par['Image Path'], exist_ok=True) dest_dir = re.sub(r'(.*)\\.*$', r'\1', par['Image Path'], re.IGNORECASE)
os.makedirs(dest_dir, exist_ok=True)
run_program(cmd) run_program(cmd)
def prep_disk_for_backup(dest=None, disk=None, ticket_id=None): def fix_path(path):
disk['Backup Warnings'] = '\n' return REGEX_BAD_PATH_NAMES.sub('_', path)
def prep_disk_for_backup(destination, disk, ticket_number):
disk['Clobber Risk'] = [] disk['Clobber Risk'] = []
width = len(str(len(disk['Partitions']))) width = len(str(len(disk['Partitions'])))
# Bail early
if dest is None:
raise Exception('Destination not provided.')
if disk is None:
raise Exception('Disk not provided.')
if ticket_id is None:
raise Exception('Ticket ID not provided.')
# Get partition totals # Get partition totals
disk['Bad Partitions'] = [par['Number'] for par in disk['Partitions'] if 'Letter' not in par or re.search(r'(RAW|Unknown)', par['FileSystem'], re.IGNORECASE)] disk['Bad Partitions'] = [par['Number'] for par in disk['Partitions']
disk['Valid Partitions'] = len(disk['Partitions']) - len(disk['Bad Partitions']) if 'Letter' not in par or REGEX_BAD_PARTITION.search(par['FileSystem'])]
num_valid_partitions = len(disk['Partitions']) - len(disk['Bad Partitions'])
# Bail if no valid partitions are found (those that can be imaged) disk['Valid Partitions'] = num_valid_partitions
if disk['Valid Partitions'] <= 0: if disk['Valid Partitions'] <= 0:
abort_to_main_menu(' No partitions can be imaged for the selected drive') print_error('ERROR: No partitions can be backed up for this disk')
raise GenericAbort
# Prep partitions # Prep partitions
for par in disk['Partitions']: for par in disk['Partitions']:
display = 'Partition {num:>{width}}:\t{size} {fs}'.format(
num = par['Number'],
width = width,
size = par['Size'],
fs = par['FileSystem'])
if par['Number'] in disk['Bad Partitions']: if par['Number'] in disk['Bad Partitions']:
par['Display String'] = '{YELLOW} * Partition {Number:>{width}}:\t{Size} {FileSystem}\t\t{q}{Name}{q}\t{Description} ({OS}){CLEAR}'.format( # Set display string using partition description & OS type
width=width, display = ' * {display}\t\t{q}{name}{q}\t{desc} ({os})'.format(
q='"' if par['Name'] != '' else '', display = display,
**par, q = '"' if par['Name'] != '' else '',
**COLORS) name = par['Name'],
desc = par['Description'],
os = par['OS'])
display = '{YELLOW}{display}{CLEAR}'.format(
display=display, **COLORS)
else: else:
# Update info for WIM capturing # Update info for WIM capturing
par['Image Name'] = str(par['Name']) par['Image Name'] = par['Name'] if par['Name'] else 'Unknown'
if par['Image Name'] == '': if 'IP' in destination:
par['Image Name'] = 'Unknown' par['Image Path'] = r'\\{}\{}\{}'.format(
if 'IP' in dest: destination['IP'], destination['Share'], ticket_number)
par['Image Path'] = '\\\\{IP}\\{Share}\\{ticket}'.format(ticket=ticket_id, **dest)
else: else:
par['Image Path'] = '{Letter}:\\{ticket}'.format(ticket=ticket_id, **dest) par['Image Path'] = r'{}:\{}'.format(
par['Image File'] = '{Number}_{Image Name}'.format(**par) ticket_number, destination['Letter'])
par['Image File'] = '{fixed_name}.wim'.format(fixed_name=re.sub(r'\W', '_', par['Image File'])) par['Image Path'] += r'\{}_{}.wim'.format(
par['Number'], par['Image Name'])
par['Image Path'] = fix_path(par['Image Path'])
# Check for existing backups # Check for existing backups
par['Image Exists'] = False par['Image Exists'] = os.path.exists(par['Image Path'])
if os.path.exists('{Image Path}\\{Image File}'.format(**par)): if par['Image Exists']:
par['Image Exists'] = True
disk['Clobber Risk'].append(par['Number']) disk['Clobber Risk'].append(par['Number'])
par['Display String'] = '{BLUE} + '.format(**COLORS) display = '{} + {}'.format(COLORS['BLUE'], display)
else: else:
par['Display String'] = '{CLEAR} '.format(**COLORS) display = '{} {}'.format(COLORS['CLEAR'], display)
# Append rest of Display String for valid/clobber partitions # Append rest of Display String for valid/clobber partitions
par['Display String'] += 'Partition {Number:>{width}}:\t{Size} {FileSystem} (Used: {Used Space})\t{q}{Name}{q}{CLEAR}'.format( display += ' (Used: {used})\t{q}{name}{q}{CLEAR}'.format(
width=width, used = par['Used Space'],
q='"' if par['Name'] != '' else '', q = '"' if par['Name'] != '' else '',
**par, name = par['Name'],
**COLORS) **COLORS)
# For all partitions
par['Display String'] = display
# Set description for bad partitions # Set description for bad partitions
if len(disk['Bad Partitions']) > 1: warnings = '\n'
disk['Backup Warnings'] += '{YELLOW} * Unable to backup these partitions{CLEAR}\n'.format(**COLORS) if disk['Bad Partitions']:
elif len(disk['Bad Partitions']) == 1: warnings += '{} * Unsupported filesystem{}\n'.format(
print_warning(' * Unable to backup this partition') COLORS['YELLOW'], COLORS['CLEAR'])
disk['Backup Warnings'] += '{YELLOW} * Unable to backup this partition{CLEAR}\n'.format(**COLORS) if disk['Clobber Risk']:
warnings += '{} + Backup exists on {}{}\n'.format(
# Set description for partitions that would be clobbered COLORS['BLUE'], destination['Name'], COLORS['CLEAR'])
if len(disk['Clobber Risk']) > 1: if disk['Bad Partitions'] or disk['Clobber Risk']:
disk['Backup Warnings'] += '{BLUE} + These partitions already have backup images on {Name}{CLEAR}\n'.format(**dest, **COLORS) warnings += '\n{}Marked partition(s) will NOT be backed up.{}\n'.format(
elif len(disk['Clobber Risk']) == 1: COLORS['YELLOW'], COLORS['CLEAR'])
disk['Backup Warnings'] += '{BLUE} + This partition already has a backup image on {Name}{CLEAR}\n'.format(**dest, **COLORS) disk['Backup Warnings'] = warnings
# Set warning for skipped partitions
if len(disk['Clobber Risk']) + len(disk['Bad Partitions']) > 1:
disk['Backup Warnings'] += '\n{YELLOW}If you continue the partitions marked above will NOT be backed up.{CLEAR}\n'.format(**COLORS)
if len(disk['Clobber Risk']) + len(disk['Bad Partitions']) == 1:
disk['Backup Warnings'] += '\n{YELLOW}If you continue the partition marked above will NOT be backed up.{CLEAR}\n'.format(**COLORS)
def select_backup_destination(): def select_backup_destination():
# Build menu # Build menu
@ -133,8 +144,8 @@ def verify_wim_backup(bin=None, par=None):
# Verify hiding all output for quicker verification # Verify hiding all output for quicker verification
print(' Partition {Number} Image...\t\t'.format(**par), end='', flush=True) print(' Partition {Number} Image...\t\t'.format(**par), end='', flush=True)
cmd = '{bin}\\wimlib\\wimlib-imagex verify "{Image Path}\\{Image File}" --nocheck'.format(bin=bin, **par) cmd = '{bin}\\wimlib\\wimlib-imagex verify "{Image Path}" --nocheck'.format(bin=bin, **par)
if not os.path.exists('{Image Path}\\{Image File}'.format(**par)): if not os.path.exists('{Image Path}'.format(**par)):
print_error('Missing.') print_error('Missing.')
else: else:
try: try:

55
Scripts/functions/winpe_menus.py
View file

@ -62,40 +62,49 @@ def menu_backup():
'GenericRepair': 'Repaired', 'GenericRepair': 'Repaired',
}} }}
# Set ticket ID # Set ticket Number
os.system('cls') os.system('cls')
ticket_id = get_ticket_number() ticket_number = get_ticket_number()
# Mount backup shares # Mount backup shares
mount_backup_shares() mount_backup_shares()
# Select destination # Select destination
dest = select_backup_destination() destination = select_backup_destination()
if dest is None: if not destination:
abort_to_main_menu('Aborting Backup Creation') raise GenericAbort
# Select disk to backup # Select disk to backup
disk = select_disk('For which drive are we creating backups?') disk = select_disk('For which drive are we creating backups?')
if disk is None: if not disk:
abort_to_main_menu() raise GenericAbort
prep_disk_for_backup(dest, disk, ticket_id)
# "Prep" disk?
prep_disk_for_backup(destination, disk, ticket_number)
# Display details for backup task # Display details for backup task
os.system('cls') os.system('cls')
print('Create Backup - Details:\n') print_info('Create Backup - Details:\n')
print(' Ticket: \t{ticket_id}'.format(ticket_id=ticket_id)) # def show_info(message='~Some message~', info='~Some info~', indent=8, width=32):
print(' Source: \t[{Table}] ({Type}) {Name} {Size}\n'.format(**disk)) show_info(message='Ticket:', info=ticket_number)
print(' Destination:\t{name}'.format(name=dest.get('Display Name', dest['Name']))) show_info(
message = 'Source:',
info = '[{Table}] ({Type}) {Name} {Size}'.format(**disk),
)
show_info(
message = 'Destination:',
info = destination.get('Display Name', destination['Name']),
)
for par in disk['Partitions']: for par in disk['Partitions']:
print(par['Display String']) show_info(message='', info=par['Display String'], width=20)
print(disk['Backup Warnings']) print_standard(disk['Backup Warnings'])
# Ask to proceed # Ask to proceed
if (not ask('Proceed with backup?')): if (not ask('Proceed with backup?')):
abort_to_main_menu('Aborting Backup Creation') raise GenericAbort
# Backup partition(s) # Backup partition(s)
print('\n\nStarting task.\n') print_info('\n\nStarting task.\n')
for par in disk['Partitions']: for par in disk['Partitions']:
message = 'Partition {} Backup...'.format(par['Number']) message = 'Partition {} Backup...'.format(par['Number'])
result = try_and_print(message=message, function=backup_partition, result = try_and_print(message=message, function=backup_partition,
@ -106,9 +115,9 @@ def menu_backup():
# Verify backup(s) # Verify backup(s)
if disk['Valid Partitions'] > 1: if disk['Valid Partitions'] > 1:
print('\n\n Verifying backups\n') print_info('\n\n Verifying backups\n')
else: else:
print('\n\n Verifying backup\n') print_info('\n\n Verifying backup\n')
for par in disk['Partitions']: for par in disk['Partitions']:
if par['Number'] in disk['Bad Partitions']: if par['Number'] in disk['Bad Partitions']:
continue # Skip verification continue # Skip verification
@ -121,9 +130,9 @@ def menu_backup():
if errors: if errors:
print_warning('\nErrors were encountered and are detailed below.') print_warning('\nErrors were encountered and are detailed below.')
for par in [p for p in disk['Partitions'] if 'Error' in p]: for par in [p for p in disk['Partitions'] if 'Error' in p]:
print(' Partition {Number} Error:'.format(**par)) print_standard(' Partition {} Error:'.format(par['Number']))
for line in [line.strip() for line in par['Error'] if line.strip() != '']: for line in [line.strip() for line in par['Error'] if line.strip()]:
print_error('\t{line}'.format(line=line)) print_error('\t{}'.format(line))
time.sleep(30) time.sleep(30)
else: else:
print_success('\nNo errors were encountered during imaging.') print_success('\nNo errors were encountered during imaging.')
@ -171,7 +180,7 @@ def menu_setup():
# Set ticket ID # Set ticket ID
os.system('cls') os.system('cls')
ticket_id = get_ticket_number() ticket_number = get_ticket_number()
# Select the version of Windows to apply # Select the version of Windows to apply
windows_version = select_windows_version() windows_version = select_windows_version()
@ -188,7 +197,7 @@ def menu_setup():
# Display details for setup task # Display details for setup task
os.system('cls') os.system('cls')
print('Setup Windows - Details:\n') print('Setup Windows - Details:\n')
print(' Ticket: \t{ticket_id}'.format(ticket_id=ticket_id)) print(' Ticket: \t{ticket_number}'.format(ticket_number=ticket_number))
print(' Installing: \t{winver}'.format(winver=windows_version['Name'])) print(' Installing: \t{winver}'.format(winver=windows_version['Name']))
print(' Boot Method:\t{_type}'.format( print(' Boot Method:\t{_type}'.format(
_type='UEFI (GPT)' if dest_disk['Use GPT'] else 'Legacy (MBR)')) _type='UEFI (GPT)' if dest_disk['Use GPT'] else 'Legacy (MBR)'))

2
Scripts/winpe_root_menu.py
View file

@ -14,6 +14,8 @@ global_vars['LogFile'] = r'{LogDir}\WinPE.log'.format(**global_vars)
if __name__ == '__main__': if __name__ == '__main__':
try: try:
menu_root() menu_root()
except GenericAbort:
pause('Press Enter to return to main menu... ')
except SystemExit: except SystemExit:
pass pass
except: except: