From 48de65dd308d5798a2ad9578a3785481fdf5b6d3 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <khronokernel@icloud.com>
Date: Sun, 13 Nov 2022 19:12:49 -0700
Subject: [PATCH] graphics_audio: avoid excessive try except usage

---
 resources/build/graphics_audio.py |  5 ++---
 resources/build/smbios.py         | 14 +++++++++-----
 resources/build/support.py        |  1 -
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/build/graphics_audio.py b/resources/build/graphics_audio.py
index 9254167ff..c50f4c960 100644
--- a/resources/build/graphics_audio.py
+++ b/resources/build/graphics_audio.py
@@ -219,10 +219,9 @@ class build_graphics_audio:
                 # Xserves and MacPro4,1 are exceptions
                 # iMac7,1 and iMac8,1 require AppleHDA/IOAudioFamily downgrade
                 if not (self.model.startswith("Xserve") or self.model in ["MacPro4,1", "iMac7,1", "iMac8,1"]):
-                    try:
-                        smbios_data.smbios_dictionary[self.model]["nForce Chipset"]
+                    if "nForce Chipset" in smbios_data.smbios_dictionary[self.model]:
                         hdef_path = "PciRoot(0x0)/Pci(0x8,0x0)"
-                    except KeyError:
+                    else:
                         hdef_path = "PciRoot(0x0)/Pci(0x1b,0x0)"
                     # In AppleALC, MacPro3,1's original layout is already in use, forcing layout 13 instead
                     if self.model == "MacPro3,1":
diff --git a/resources/build/smbios.py b/resources/build/smbios.py
index 978ba6491..f583276ee 100644
--- a/resources/build/smbios.py
+++ b/resources/build/smbios.py
@@ -44,6 +44,7 @@ class build_smbios:
 
     def set_smbios(self):
         spoofed_model = self.model
+
         if self.constants.override_smbios == "Default":
             if self.constants.serial_settings != "None":
                 print("- Setting macOS Monterey Supported SMBIOS")
@@ -54,13 +55,16 @@ class build_smbios:
         else:
             spoofed_model = self.constants.override_smbios
         print(f"- Using Model ID: {spoofed_model}")
-        try:
-            spoofed_board = smbios_data.smbios_dictionary[spoofed_model]["Board ID"]
-            print(f"- Using Board ID: {spoofed_board}")
-        except KeyError:
-            spoofed_board = ""
+
+        spoofed_board = ""
+        if spoofed_model in smbios_data.smbios_dictionary:
+            if "Board ID" in smbios_data.smbios_dictionary[spoofed_model]:
+                spoofed_board = smbios_data.smbios_dictionary[spoofed_model]["Board ID"]
+        print(f"- Using Board ID: {spoofed_board}")
+
         self.spoofed_model = spoofed_model
         self.spoofed_board = spoofed_board
+
         if self.constants.allow_oc_everywhere is False or self.constants.allow_native_spoofs is True:
             self.config["#Revision"]["Spoofed-Model"] = f"{self.spoofed_model} - {self.constants.serial_settings}"
 
diff --git a/resources/build/support.py b/resources/build/support.py
index 770b99442..8cb30ba11 100644
--- a/resources/build/support.py
+++ b/resources/build/support.py
@@ -47,7 +47,6 @@ class build_support:
             # Check failed
             return
 
-        # Is the kext already enabled?
         if kext["Enabled"] is True:
             return