mirror of
https://github.com/outbackdingo/OpCore-Simplify.git
synced 2026-08-25 14:53:06 +00:00
Enhance user interface for hardware report and macOS version selection
This commit is contained in:
@@ -205,12 +205,4 @@ class CompatibilityChecker:
|
||||
hardware["Storage Controllers"] = self.check_storage_compatibility(hardware.get("Storage Controllers"))
|
||||
self.check_sd_controller_compatibility(hardware)
|
||||
|
||||
hardware["Compatibility"] = {
|
||||
"macOS Version": {
|
||||
"Max Version": ".".join(str(item) for item in self.max_supported_macos_version),
|
||||
"Min Version": ".".join(str(item) for item in self.min_supported_macos_version)
|
||||
} if self.max_supported_macos_version != (-1, -1, -1) else None,
|
||||
"Unsupported Devices": self.unsupported_devices
|
||||
}
|
||||
|
||||
return hardware
|
||||
return () if self.max_supported_macos_version[0] == -1 else (".".join(str(item) for item in self.min_supported_macos_version), ".".join(str(item) for item in self.max_supported_macos_version)), self.unsupported_devices
|
||||
@@ -376,7 +376,7 @@ class builder:
|
||||
print("")
|
||||
self.utils.request_input()
|
||||
|
||||
def build_efi(self, hardware, macos_version):
|
||||
def build_efi(self, hardware, unsupported_devices, macos_version):
|
||||
efi_directory = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "Results")
|
||||
|
||||
self.utils.create_folder(efi_directory, remove_content=True)
|
||||
@@ -410,7 +410,7 @@ class builder:
|
||||
hardware_shorc["Input"] = hardware.get("Input")
|
||||
hardware_shorc["Storage Controllers"] = hardware.get("Storage Controllers")
|
||||
hardware_shorc["Intel MEI"] = hardware.get("Intel MEI")
|
||||
hardware_shorc["Unsupported Devices"] = hardware.get("Compatibility").get("Unsupported Devices")
|
||||
hardware_shorc["Unsupported Devices"] = unsupported_devices
|
||||
|
||||
forbidden_chars = r'[<>:"/\\|?*]'
|
||||
hardware_shorc["Motherboard Name"] = re.sub(forbidden_chars, '_', hardware_shorc["Motherboard Name"])
|
||||
|
||||
Reference in New Issue
Block a user