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

Refactor partition table type lookup sections

Browse source
This commit is contained in:
2Shirt 2022-05-20 17:58:07 -07:00
parent cf7ed909b3
commit 544ffb1aff
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/wk/clone/ddrescue.py
View file

@ -526,7 +526,7 @@ class State():
settings['Table Type'] = 'MBR' settings['Table Type'] = 'MBR'
else: else:
# Match source type # Match source type
settings['Table Type'] = get_table_type(self.source) settings['Table Type'] = get_table_type(self.source.path)
if std.ask('Create an empty Windows boot partition on the clone?'): if std.ask('Create an empty Windows boot partition on the clone?'):
settings['Create Boot Partition'] = True settings['Create Boot Partition'] = True
offset = 2 if settings['Table Type'] == 'GPT' else 1 offset = 2 if settings['Table Type'] == 'GPT' else 1
@ -1728,14 +1728,36 @@ def get_percent_color(percent):
return color return color
def get_table_type(disk): def get_table_type(disk_path):
"""Get disk partition table type, returns str. """Get disk partition table type, returns str.
NOTE: If resulting table type is not GPT or MBR NOTE: If resulting table type is not GPT or MBR
then an exception is raised. then an exception is raised.
""" """
table_type = str(disk.raw_details.get('pttype', '')).upper() disk_path = str(disk_path)
table_type = table_type.replace('DOS', 'MBR') table_type = None
# Linux
if std.PLATFORM == 'Linux':
cmd = f'lsblk --json --output=pttype --nodeps {disk_path}'.split()
json_data = exe.get_json_from_command(cmd)
table_type = json_data['blockdevices'][0].get('pttype', '').upper()
table_type = table_type.replace('DOS', 'MBR')
# macOS
if std.PLATFORM == 'Darwin':
cmd = ['diskutil', 'list', '-plist', disk_path]
proc = exe.run_program(cmd, check=False, encoding=None, errors=None)
try:
plist_data = plistlib.loads(proc.stdout)
except (TypeError, ValueError):
# Invalid / corrupt plist data? return empty dict to avoid crash
pass
else:
disk_details = plist_data.get('AllDisksAndPartitions', [{}])[0]
table_type = disk_details['Content']
table_type = table_type.replace('FDisk_partition_scheme', 'MBR')
table_type = table_type.replace('GUID_partition_scheme', 'GPT')
# Check type # Check type
if table_type not in ('GPT', 'MBR'): if table_type not in ('GPT', 'MBR'):