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

Fix rare crashes caused by damaged disks

Browse source
This commit is contained in:
Alan Mason 2017-12-03 09:10:09 -08:00
parent 7e4a0259c7
commit 1848c7dc66
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.bin/Scripts/functions/disk.py
View file

@ -335,7 +335,12 @@ def select_disk(title='Which disk?', disks=[]):
# Build menu # Build menu
disk_options = [] disk_options = []
for disk in disks: for disk in disks:
display_name = '{Size}\t[{Table}] ({Type}) {Name}'.format(**disk) display_name = '{}\t[{}] ({}) {}'.format(
disk.get('Size', ''),
disk.get('Table', ''),
disk.get('Type', ''),
disk.get('Name', 'Unknown'),
)
pwidth=len(str(len(disk['Partitions']))) pwidth=len(str(len(disk['Partitions'])))
for partition in disk['Partitions']: for partition in disk['Partitions']:
# Main text # Main text

14
.bin/Scripts/functions/winpe_menus.py
View file

@ -114,7 +114,12 @@ def menu_backup():
show_data(message='Ticket:', data=ticket_number) show_data(message='Ticket:', data=ticket_number)
show_data( show_data(
message = 'Source:', message = 'Source:',
data = '[{Table}] ({Type}) {Name} {Size}'.format(**disk), data = '[{}] ({}) {} {}'.format(
disk.get('Table', ''),
disk.get('Type', ''),
disk.get('Name', 'Unknown'),
disk.get('Size', ''),
),
) )
show_data( show_data(
message = 'Destination:', message = 'Destination:',
@ -293,7 +298,12 @@ def menu_setup():
show_data(message='Using Image:', data=windows_image['Path']) show_data(message='Using Image:', data=windows_image['Path'])
show_data( show_data(
message = 'ERASING:', message = 'ERASING:',
data = '[{Table}] ({Type}) {Name} {Size}\n'.format(**dest_disk), data = '[{}] ({}) {} {}\n'.format(
dest_disk.get('Table', ''),
dest_disk.get('Type', ''),
dest_disk.get('Name', 'Unknown'),
dest_disk.get('Size', ''),
),
warning = True) warning = True)
for par in dest_disk['Partitions']: for par in dest_disk['Partitions']:
show_data( show_data(