Merge branch 'main' into logging-rework

CHANGELOG.md

@@ -1,6 +1,12 @@
 # OpenCore Legacy Patcher changelog
 
 ## 0.6.7
+- Resolve partition buttons overlapping in Install OpenCore UI
+  - ex. "EFI" and additional FAT32 partitions on a single drive
+- Re-enable mediaanalysisd on Ventura
+  - Allows for Live Text support on systems with3802 GPUs
+    - ie. Intel Ivy Bridge and Haswell, Nvidia Kepler
+  - Previously disabled due to high instability in Photos with Face Scanning, now resolved
 - Backend changes:
   - Call `setpgrp()` to prevent app from being killed if parent process is killed (ie. LaunchAgents)
   - Rework logging handler:
@@ -12,6 +18,7 @@
     - Reveal log file in Finder on main thread crash
   - Resolve SharedSupport.dmg pathing error during macOS Installer Verification
     - Applicable to systems with 2 (or more) USB Installers with the same name plugged in
+  - Resolve payloads path being mis-routed during CLI calls
 
 ## 0.6.6
 - Implement option to disable ColorSync downgrade on HD 3000 Macs

LICENSE.txt

@@ -0,0 +1,14 @@
+Copyright (c) 2020-2023, Dhinak G
+Copyright (c) 2020-2023, Mykola Grymalyuk
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
+This product includes software developed by the organization.
+4. Neither the name of the copyright holder nor the names the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docs/LICENSE.md

@@ -20,4 +20,4 @@ This patcher is made of multiple external applications from different people and
   * [VMM Patch Set](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/4a8f61a01da72b38a4b2250386cc4b497a31a839/payloads/Config/config.plist#L1222-L1281) - parrotgeek1
   * Apple Binaries - Apple Inc.
 
-Remaining files within OpenCore Legacy Patcher are copyrighted 2020-2022 Mykola Grymalyuk & Dhinak G. For integration into other projects, please request written permission.
+Remaining files within OpenCore Legacy Patcher are distributed under BSD-4-Clause license.

resources/build/misc.py

@@ -106,23 +106,6 @@ class BuildMiscellaneous:
             logging.info("- Disabling memory error reporting")
             re_block_args.append("pcie")
 
-        # Resolve mediaanalysisd crashing on 3802 GPUs
-        gpu_dict = [] if self.constants.custom_model else self.constants.computer.gpus
-        if gpu_dict == []:
-            gpu_dict = smbios_data.smbios_dictionary[self.model]["Stock GPUs"] if self.model in smbios_data.smbios_dictionary else []
-
-        for gpu in gpu_dict:
-            if not self.constants.custom_model:
-                gpu = gpu.arch
-            if gpu in [
-                device_probe.Intel.Archs.Ivy_Bridge,
-                device_probe.Intel.Archs.Haswell,
-                device_probe.NVIDIA.Archs.Kepler,
-            ]:
-                logging.info("- Disabling mediaanalysisd")
-                re_block_args.append("media")
-                break
-
         return re_block_args
 
 

resources/integrity_verification.py

@@ -100,6 +100,18 @@ class ChunklistVerification:
             self.status = ChunklistStatus.FAILURE
             return
 
+        if not Path(self.file_path).exists():
+            self.error_msg = f"File {self.file_path} does not exist"
+            self.status = ChunklistStatus.FAILURE
+            logging.info(self.error_msg)
+            return
+
+        if not Path(self.file_path).is_file():
+            self.error_msg = f"File {self.file_path} is not a file"
+            self.status = ChunklistStatus.FAILURE
+            logging.info(self.error_msg)
+            return
+
         with self.file_path.open("rb") as f:
             for chunk in self.chunks:
                 self.current_chunk += 1

resources/main.py

@@ -104,9 +104,6 @@ class OpenCoreLegacyPatcher:
         ignore_args = ["--auto_patch", "--gui_patch", "--gui_unpatch", "--update_installed"]
         if not any(x in sys.argv for x in ignore_args):
             self.constants.current_path = Path.cwd()
-            if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
-                self.constants.payload_path = sys._MEIPASS / Path("payloads")
-                logging.info("Rerouting payloads location")
         ignore_args = ignore_args.pop(0)
 
         if not any(x in sys.argv for x in ignore_args):

resources/network_handler.py

@@ -316,6 +316,7 @@ class DownloadObject:
             logging.error(f"Error preparing working directory {path}: {self.error_msg}")
             return False
 
+        logging.info(f"- Directory ready: {path}")
         return True
 
 

resources/wx_gui/gui_install_oc.py

@@ -197,14 +197,16 @@ class InstallOCFrame(wx.Frame):
         items = len(partitions)
         longest_label = max((len(partitions[partition]['partition']) + len(partitions[partition]['name']) + len(str(partitions[partition]['size']))) for partition in partitions)
         longest_label = longest_label * 10
+        spacer = 0
         logging.info(f"Available partitions for {disk}:")
         for partition in partitions:
             logging.info(f"- {partitions[partition]['partition']} - {partitions[partition]['name']} - {partitions[partition]['size']}")
-            disk_button = wx.Button(dialog, label=f"{partitions[partition]['partition']} - {partitions[partition]['name']} - {partitions[partition]['size']}", size=(longest_label,30), pos=(-1, text_label.GetPosition()[1] + text_label.GetSize()[1] + 5))
+            disk_button = wx.Button(dialog, label=f"{partitions[partition]['partition']} - {partitions[partition]['name']} - {partitions[partition]['size']}", size=(longest_label,30), pos=(-1, text_label.GetPosition()[1] + text_label.GetSize()[1] + 5 + spacer))
             disk_button.Centre(wx.HORIZONTAL)
             disk_button.Bind(wx.EVT_BUTTON, lambda event, partition=partition: self._install_oc_process(partition))
             if items == 1 or self.constants.booted_oc_disk == partitions[partition]['partition']:
                 disk_button.SetDefault()
+            spacer += 25
 
         # Add button: Return to main menu
         return_button = wx.Button(dialog, label="Return to main menu", size=(150,30), pos=(-1, disk_button.GetPosition()[1] + disk_button.GetSize()[1]))