fix some bugs && update to 3.0.4

Author: pyquick

.github/workflows/build-release.yml

@@ -6,7 +6,7 @@ on:
             description: 'Version'
             required: true
             type: string
-            default: '3.0.3'
+            default: '3.0.4'
         pre_release:
             description: 'Pre-release or not'
             required: true

.gitignore

@@ -13,6 +13,7 @@ CLAUDE.MD
 /.claude
 /dist
 /.vscode
+Unknown.png
 __pycache__/
 *.kext
 *.py[cod]

oclp_r/constants.py

@@ -20,7 +20,7 @@ def __init__(self) -> None:
         self.metallib_api_link:               str = ""
 
         # Patcher Versioning
-        self.patcher_version:                 str = "3.0.3"  # OCLP-R
+        self.patcher_version:                 str = "3.0.4"  # OCLP-R
         self.patcher_support_pkg_version:     str = "1.11.1"  # PatcherSupportPkg
         self.copyright_date:                  str = "Copyright © 2020-2026 Dortania and Hackdoc"
         self.patcher_name:                    str = "OCLP-R"

oclp_r/efi_builder/support.py

@@ -189,7 +189,7 @@ def _validate_malformed_kexts(self, directory: str | Path) -> None:
                 expected_executable = Path(kext_folder / Path("Contents/MacOS") / Path(kext_data["CFBundleExecutable"]))
                 if not expected_executable.exists():
                     logging.info(self.trans["- Missing executable for {kext_folder_name}: Contents/MacOS/{expected_executable_name}"].format(kext_folder_name=kext_folder.name, expected_executable_name=expected_executable.name))
-                    raise Exception(self.trans[" - Missing executable for {kext_folder_name}: Contents/MacOS/{expected_executable_name}"].format(kext_folder_name=kext_folder.name, expected_executable_name=expected_executable.name))
+                    raise Exception(self.trans["- Missing executable for {kext_folder_name}: Contents/MacOS/{expected_executable_name}"].format(kext_folder_name=kext_folder.name, expected_executable_name=expected_executable.name))
 
             if Path(kext_folder / Path("Contents/PlugIns")).exists():
                 self._validate_malformed_kexts(kext_folder / Path("Contents/PlugIns"))

oclp_r/support/kdk_handler.py

@@ -581,7 +581,9 @@ def validate_kdk_checksum(self, kdk_dmg_path: str = None) -> bool:
         if result.returncode != 0:
             logging.info(self.trans["Error: Kernel Debug Kit checksum verification failed!"])       
             subprocess_wrapper.log(result)
-            msg = self.trans["Kernel Debug Kit checksum verification failed, please try again.\n\nIf this continues to fail, ensure you're downloading on a stable network connection (ie. Ethernet)"]
+            part1 = self.trans["Kernel Debug Kit checksum verification failed, please try again."]
+            part2 = self.trans["If this continues to fail, ensure you're downloading on a stable network connection (ie. Ethernet)"]
+            msg = f"{part1}\n\n{part2}"
             logging.info(f"{msg}")
 
             self.error_msg = msg

oclp_r/support/translate_language.py

@@ -549,6 +549,7 @@ def network_handler(self):
                 "Failed to delete temporary files: {0}":"Failed to delete temporary files: {0}",
                 "Downloaded {0} of {1}":"Downloaded {0} of {1}",
                 "Downloaded {0:.2f}% of {1} ({2}/s) ({3:.2f} seconds remaining)":"Downloaded {0:.2f}% of {1} ({2}/s) ({3:.2f} seconds remaining)",
+                "Content-Length missing from headers":"Content-Length missing from headers",
             }
         elif self.language_point=="简体中文":
             trans={
@@ -586,6 +587,7 @@ def network_handler(self):
                 "Failed to delete temporary files: {0}":"删除临时文件失败: {0}",
                 "Downloaded {0} of {1}":"已下载 {0} ,共 {1}",
                 "Downloaded {0:.2f}% of {1} ({2}/s) ({3:.2f} seconds remaining)":"已下载 {0:.2f}% ,共 {1} ,速度 {2} ,剩余时间 {3:.2f} 秒",
+                "Content-Length missing from headers":"响应头中缺少 Content-Length",
             }
         return trans
     def private(self):
@@ -1011,6 +1013,7 @@ def gui_KDK_download(self):
                 "Ventura":"Ventura",
                 "Failed to detect OS build: ":"Failed to detect OS build: ",
                 "Available installers on Dortania":"Available installers on Dortania",
+                "Cannot find any KDKs on Dortania":"Cannot find any KDKs on Dortania",
             }
         elif self.language_point=="简体中文":
             trans={
@@ -1035,9 +1038,10 @@ def gui_KDK_download(self):
                 "Sonoma":"Sonoma",
                 "Ventura":"Ventura",
                 "Available installers on Dortania":"Dortania 上可用的安装器",
+                "Cannot find any KDKs on Dortania":"在 Dortania 上找不到任何 KDK",
             }
         return trans
-    
+
     def gui_about(self):
         if self.language_point=="English":
             trans={
@@ -1256,6 +1260,7 @@ def gui_install_oc(self):
                 "Available disks:":"Available disks:",
                 "Available partitions for ":"Available partitions for ",
                 'OpenCore has finished installing to disk.\n\nYou can eject the drive, insert it into the ':'OpenCore has finished installing to disk.\n\nYou can eject the drive, insert it into the ',
+                "Note: Blue represents the disk OpenCore is currently booted from":"Note: Blue represents the disk OpenCore is currently booted from",
             }
         elif self.language_point=="简体中文":
             trans={
@@ -1281,10 +1286,11 @@ def gui_install_oc(self):
                 "Would you like to reboot?":"要重启吗？",
                 "You can eject the drive, insert it into the ":"您可以弹出驱动器，将其插入 ",
                 "reboot, hold the Option key and select OpenCore/Boot EFI\'s option.":"重启，按住 Option 键，然后选择 OpenCore/Boot EFI 选项。",
-                "An internal error occurred while installing:\n":"安装过程中发生内部错误:\n"
+                "An internal error occurred while installing:\n":"安装过程中发生内部错误:\n",
+                "Note: Blue represents the disk OpenCore is currently booted from":"注意：蓝色表示当前 OpenCore 启动所在的磁盘",
             }
         return trans
-    
+
     def gui_macos_installer_download(self):
         if self.language_point=="English":
             trans={
@@ -2052,6 +2058,7 @@ def gui_settings(self):
                 "Provide English & Chinese Simplified.":"Provide English & Chinese Simplified.",
                 "Updating System Defaults: {variable} = {value} ({value_type})":"Updating System Defaults: {variable} = {value} ({value_type})",
                 "Updating System Defaults (root): {variable} = {value} ({value_type})":"Updating System Defaults (root): {variable} = {value} ({value_type})",
+                "Root Volume update Failed, check terminal output":"Root Volume update Failed, check terminal output",
             }
         elif self.language_point=="简体中文":
             trans={
@@ -2400,10 +2407,11 @@ def gui_settings(self):
                 "Statistics":"统计信息",
                 "Populate Stats":"填充统计信息",
                 "Return":"返回",
-                "This settings requires 'gpu-power-prefs' NVRAM argument to be set to '1'.\n\nIf missing and this option is toggled, the system will not boot\n\nFull command:\nnvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%01%00%00%00":"此设置需要 'gpu-power-prefs' NVRAM 参数设置为 '1'。\n\n如果缺失且此选项被切换，系统将无法启动\n\n完整命令：\nnvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%01%00%00%00"
+                "This settings requires 'gpu-power-prefs' NVRAM argument to be set to '1'.\n\nIf missing and this option is toggled, the system will not boot\n\nFull command:\nnvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%01%00%00%00":"此设置需要 'gpu-power-prefs' NVRAM 参数设置为 '1'。\n\n如果缺失且此选项被切换，系统将无法启动\n\n完整命令：\nnvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%01%00%00%00",
+                "Root Volume update Failed, check terminal output":"根卷更新失败，请检查终端输出",
             }
         return trans
-    
+
     def gui_support(self):
         if self.language_point=="English":
             trans={
@@ -2687,6 +2695,7 @@ def detect(self):
                 "Stripping out Non-Metal GPUs":"Stripping out Non-Metal GPUs",
                 "  Stripping out {hardware_name}":"  Stripping out {hardware_name}",
                 "Cannot mix Metal 3802 and Metal 31001 GPUs on macOS Sequoia or newer":"Cannot mix Metal 3802 and Metal 31001 GPUs on macOS Sequoia or newer",
+                "Stripping out Metal 3802 GPUs":"Stripping out Metal 3802 GPUs",
             }
         elif self.language_point=="简体中文":
             trans={
@@ -2720,7 +2729,8 @@ def detect(self):
                 "Validation: nvda_drv(_vrl) variable missing":"Validation: 缺少nvda_drv(_vrl)变量",
                 "Validation: Patching not possible":"Validation: 无法修补",
                 "Validation: Unpatching not possible":"Validation: 无法取消修补",
-                "Validation: Root volume dirty":"Validation: 根卷目录已被修补"
+                "Validation: Root volume dirty":"Validation: 根卷目录已被修补",
+                "Stripping out Metal 3802 GPUs":"排除 Metal 3802 GPU",
             }
         return trans
     def auto_patcher(self):

oclp_r/wx_gui/gui_sys_patch_start.py

@@ -100,7 +100,7 @@ def _kdk_thread_spawn():
         if self.kdk_obj.success is False:
             progress_bar_animation.stop_pulse()
             progress_bar.SetValue(0)
-            wx.MessageBox(f"{self.trans["KDK download failed:"]} {self.kdk_obj.error_msg}", self.trans["Error"], wx.OK | wx.ICON_ERROR)
+            wx.MessageBox(f"{self.trans["KDK download failed: "]}{self.kdk_obj.error_msg}", self.trans["Error"], wx.OK | wx.ICON_ERROR)
             return False
 
         kdk_download_obj = self.kdk_obj.retrieve_download()
@@ -132,7 +132,7 @@ def _kdk_thread_spawn():
             progress_bar.SetValue(0)
             logging.error(self.trans["KDK checksum validation failed"])
             logging.error(self.kdk_obj.error_msg)
-            msg = wx.MessageDialog(frame, f"{self.trans["KDK checksum validation failed:"]} {self.kdk_obj.error_msg}", self.trans["Error"], wx.OK | wx.ICON_ERROR)
+            msg = wx.MessageDialog(frame, f"{self.trans["KDK checksum validation failed: "]}{self.kdk_obj.error_msg}", self.trans["Error"], wx.OK | wx.ICON_ERROR)
             msg.ShowModal()
             return False
 
@@ -181,7 +181,7 @@ def _metallib_thread_spawn():
         if self.metallib_obj.success is False:
             progress_bar_animation.stop_pulse()
             progress_bar.SetValue(0)
-            wx.MessageBox(f"{self.trans["Metallib download failed:"]} {self.metallib_obj.error_msg}", self.trans["Error"], wx.OK | wx.ICON_ERROR)
+            wx.MessageBox(f"{self.trans["Metallib download failed: "]}{self.metallib_obj.error_msg}", self.trans["Error"], wx.OK | wx.ICON_ERROR)
             return False
 
         self.metallib_download_obj = self.metallib_obj.retrieve_download()
@@ -194,7 +194,7 @@ def _metallib_thread_spawn():
             title=self.title,
             global_constants=self.constants,
             download_obj=self.metallib_download_obj,
-            item_name=f"{self.trans["Metallib Build"]} {self.metallib_obj.metallib_url_build}"
+            item_name=f"{self.trans["Metallib Build "]}{self.metallib_obj.metallib_url_build}"
         )
         if self.metallib_download_obj.download_complete is False:
             return False