Merge branch 'main' into web-driver-alpha

gui/gui_main.py

@@ -16,7 +16,7 @@ from pathlib import Path
 import binascii
 import hashlib
 
-from resources import constants, defaults, build, install, installer, sys_patch_download, utilities, sys_patch_detect, sys_patch, run, generate_smbios, updates, integrity_verification
+from resources import constants, defaults, build, install, installer, sys_patch_download, utilities, sys_patch_detect, sys_patch, run, generate_smbios, updates, integrity_verification, global_settings
 from data import model_array, os_data, smbios_data, sip_data
 from gui import menu_redirect, gui_help
         
@@ -180,8 +180,8 @@ class wx_python_gui:
             threading.Thread(target=self.check_for_updates).start()
     
     def check_for_updates(self, event=None):
-        ignore_updates = subprocess.run(["defaults", "read", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "IgnoreAppUpdates"], capture_output=True).stdout.decode("utf-8").strip()
-        if ignore_updates not in ["1", "True", "TRUE"]:
+        ignore_updates = global_settings.global_settings().read_property("IgnoreAppUpdates")
+        if ignore_updates is not True:
             self.constants.ignore_updates = False
             dict = updates.check_binary_updates(self.constants).check_binary_updates()
             if dict:
@@ -202,7 +202,7 @@ class wx_python_gui:
                     elif responce == wx.ID_NO:
                         print("- Setting IgnoreAppUpdates to True")
                         self.constants.ignore_updates = True
-                        subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "IgnoreAppUpdates", "-bool", "TRUE"])
+                        global_settings.global_settings().write_property("IgnoreAppUpdates", True)
         else:
             self.constants.ignore_updates = True
             print("- Ignoring App Updates due to defaults")
@@ -2403,9 +2403,9 @@ class wx_python_gui:
     def set_ignore_app_updates_click(self, event):
         self.constants.ignore_updates = self.set_ignore_app_updates_checkbox.GetValue()
         if self.constants.ignore_updates is True:
-            subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "IgnoreAppUpdates", "-bool", "TRUE"])
+            global_settings.write_property("IgnoreAppUpdates", True)
         else:
-            subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "IgnoreAppUpdates", "-bool", "FALSE"])
+            global_settings.write_property("IgnoreAppUpdates", False)
 
     def firewire_click(self, event=None):
         if self.firewire_boot_checkbox.GetValue():
@@ -2466,11 +2466,11 @@ class wx_python_gui:
     def ts2_accel_click(self, event=None):
         if self.set_terascale_accel_checkbox.GetValue():
             print("TS2 Acceleration Enabled")
-            subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "MacBookPro_TeraScale_2_Accel", "-bool", "TRUE"])
+            global_settings.global_settings().write_property("MacBookPro_TeraScale_2_Accel", True)
             self.constants.allow_ts2_accel = True
         else:
             print("TS2 Acceleration Disabled")
-            subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "MacBookPro_TeraScale_2_Accel", "-bool", "FALSE"])
+            global_settings.global_settings().write_property("MacBookPro_TeraScale_2_Accel", False)
             self.constants.allow_ts2_accel = False
     
     def force_web_drivers_click(self, event=None):

resources/cli_menu.py

@@ -3,7 +3,7 @@
 import sys
 import subprocess
 
-from resources import constants, install, utilities, defaults, sys_patch, installer, tui_helpers
+from resources import constants, install, utilities, defaults, sys_patch, installer, tui_helpers, global_settings
 from data import cpu_data, smbios_data, model_array, os_data, mirror_data
 
 
@@ -589,10 +589,10 @@ handle acceleration tasks.
 
         change_menu = input("Allow TeraScale 2 Acceleration?(y/n/q): ")
         if change_menu in {"y", "Y", "yes", "Yes"}:
-            subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "MacBookPro_TeraScale_2_Accel", "-bool", "TRUE"])
+            global_settings.global_settings().write_property("MacBookPro_TeraScale_2_Accel", True)
             self.constants.allow_ts2_accel = True
         elif change_menu in {"n", "N", "no", "No"}:
-            subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "MacBookPro_TeraScale_2_Accel", "-bool", "FALSE"])
+            global_settings.global_settings().write_property("MacBookPro_TeraScale_2_Accel", False)
             self.constants.allow_ts2_accel = False
         elif change_menu in {"q", "Q", "Quit", "quit"}:
             print("Returning to previous menu")

resources/defaults.py

@@ -1,5 +1,5 @@
 # Generate Default Data
-from resources import utilities, device_probe, generate_smbios
+from resources import utilities, device_probe, generate_smbios, global_settings
 from data import model_array, smbios_data, cpu_data
 import subprocess
 
@@ -122,11 +122,11 @@ class generate_defaults:
         if model in ["MacBookPro8,2", "MacBookPro8,3"]:
             # Users disabling TS2 most likely have a faulty dGPU
             # users can override this in settings
-            ts2_status = subprocess.run(["defaults", "read", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "MacBookPro_TeraScale_2_Accel"], stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
-            if ts2_status in ["1", "true"]:
+            ts2_status = global_settings.global_settings().read_property("MacBookPro_TeraScale_2_Accel")
+            if ts2_status is True:
                 settings.allow_ts2_accel = True
             else:
-                subprocess.run(["defaults", "write", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "MacBookPro_TeraScale_2_Accel", "-bool", "FALSE"])
+                global_settings.global_settings().write_property("MacBookPro_TeraScale_2_Accel", False)
                 settings.allow_ts2_accel = False
 
         try:

resources/global_settings.py

@@ -0,0 +1,46 @@
+# Alternative to Apple's 'defaults' tool
+# Store data in '/Users/Shared'
+# This is to ensure compatibility when running wihout a user
+# ie. during automated patching
+
+from pathlib import Path
+import plistlib
+
+class global_settings:
+
+    def __init__(self):
+        self.file_name = ".com.dortania.opencore-legacy-patcher.plist"
+        self.global_settings_folder = "/Users/Shared"
+        self.global_settings_plist = f"{self.global_settings_folder}/{self.file_name}"
+        self.generate_settings_file()
+    
+    def generate_settings_file(self):
+        if Path(self.global_settings_plist).exists():
+            return
+        plistlib.dump({"Developed by Dortania": True,}, Path(self.global_settings_plist).open("wb"))
+
+    def read_property(self, property_name):
+        plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
+        if property_name in plist:
+            return plist[property_name]
+        return None
+    
+    def write_property(self, property_name, property_value):
+        plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
+        plist[property_name] = property_value
+        plistlib.dump(plist, Path(self.global_settings_plist).open("wb"))
+
+
+    def convert_defaults_to_global_settings(self):
+        defaults_path = "~/Library/Preferences/com.dortania.opencore-legacy-patcher.plist"
+        defaults_path = Path(defaults_path).expanduser()
+
+        if Path(defaults_path).exists():
+            defaults_plist = plistlib.load(Path(defaults_path).open("rb"))
+            # merge defaults with global settings
+            global_settings_plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
+            global_settings_plist.update(defaults_plist)
+            plistlib.dump(global_settings_plist, Path(self.global_settings_plist).open("wb"))
+
+            # delete defaults plist
+            Path(defaults_path).unlink()

resources/main.py

@@ -8,7 +8,7 @@ from pathlib import Path
 import time
 import threading
 
-from resources import build, cli_menu, constants, utilities, device_probe, os_probe, defaults, arguments, install, tui_helpers, reroute_payloads
+from resources import build, cli_menu, constants, utilities, device_probe, os_probe, defaults, arguments, install, tui_helpers, reroute_payloads, global_settings
 from data import model_array
 
 class OpenCoreLegacyPatcher:
@@ -46,6 +46,7 @@ class OpenCoreLegacyPatcher:
         self.constants.unpack_thread.start()
 
         defaults.generate_defaults.probe(self.computer.real_model, True, self.constants)
+        global_settings.global_settings().convert_defaults_to_global_settings()
 
         if utilities.check_cli_args() is not None:
             print("- Detected arguments, switching to CLI mode")

resources/sys_patch_auto.py

@@ -12,7 +12,7 @@ from pathlib import Path
 import plistlib
 import subprocess
 import webbrowser
-from resources import sys_patch_detect, utilities, sys_patch_detect, updates
+from resources import sys_patch_detect, utilities, sys_patch_detect, updates, global_settings
 from gui import gui_main
 
 class AutomaticSysPatch:
@@ -112,8 +112,8 @@ class AutomaticSysPatch:
 
         print("- Determining if macOS drive matches boot drive")
 
-        should_notify = subprocess.run(["defaults", "read", "~/Library/Preferences/com.dortania.opencore-legacy-patcher", "AutoPatch_Notify_Mismatched_Disks"], stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
-        if should_notify in ["0", "false"]:
+        should_notify = global_settings.global_settings().read_property("AutoPatch_Notify_Mismatched_Disks")
+        if should_notify is False:
             print("- Skipping due to user preference")
         else:
             if settings.booted_oc_disk: