Network improve

Author: intsant

OCLP-R-GUI.spec

@@ -70,7 +70,7 @@ coll = COLLECT(exe,
 
 app = BUNDLE(coll,
              name='OCLP-R.app',
-             icon="payloads/Icon/AppIcons/OCR.icns",
+             icon="payloads/Icon/AppIcons/OC-Patcher.icns",
              bundle_identifier="com.hackdoc.oclp-r",
              info_plist={
                 "CFBundleName": "OCLP-R",

oclp_r/constants.py

@@ -777,7 +777,7 @@ def icns_resource_path(self):
 
     @property
     def app_icon_path(self):
-        return self.payload_path / Path("Icon/AppIcons/OCR.icns")
+        return self.payload_path / Path("Icon/AppIcons/OC-Patcher.icns")
 
     @property
     def icon_path_external(self):

oclp_r/support/kdk_handler.py

@@ -25,7 +25,7 @@
 KDK_INSTALL_PATH: str  = "/Library/Developer/KDKs"
 KDK_INFO_PLIST:   str  = "KDKInfo.plist"
 KDK_API_LINK_ORG:     str  = "https://dortania.github.io/KdkSupportPkg/manifest.json"
-KDK_API_LINK_PROXY:str  = "https://oclpapi.simplehac.cn/KdkSupportPkg/manifest.json"
+KDK_API_LINK_PROXY:str  = "https://next.oclpapi.simplehac.cn/KdkSupportPkg/manifest.json"
 KDK_ASSET_LIST:   list = None
 
 class KernelDebugKitObject:

oclp_r/support/metallib_handler.py

@@ -18,7 +18,7 @@
 
 METALLIB_INSTALL_PATH: str  = "/Library/Application Support/Hackdoc/MetallibSupportPkg"
 METALLIB_API_LINK_ORG:     str  = "https://dortania.github.io/MetallibSupportPkg/manifest.json"
-METALLIB_API_LINK_PROXY:str ="https://oclpapi.simplehac.cn/MetallibSupportPkg/manifest.json"
+METALLIB_API_LINK_PROXY:str ="https://next.oclpapi.simplehac.cn/MetallibSupportPkg/manifest.json"
 METALLIB_ASSET_LIST:   list = None
 
 

oclp_r/support/network_handler.py

@@ -16,6 +16,8 @@
 from typing import Union
 from pathlib import Path
 
+from urllib3 import response
+
 from . import utilities
 from .. import constants
 SESSION = requests.Session()
@@ -56,7 +58,11 @@ def verify_network_connection(self) -> bool:
         """
 
         try:
-            requests.head(self.url, timeout=5, allow_redirects=True)
+            response=requests.head(self.url, timeout=5, allow_redirects=True,verify=False)
+            if response.status_code == 200:
+                return True
+            if response.status_code == 404:
+                return False
             return True
         except (
             requests.exceptions.Timeout,

oclp_r/sys_patch/patchsets/hardware/misc/Launch.py

@@ -4,7 +4,7 @@
 """
 
 from ..base import BaseHardware, HardwareVariant
-
+from .....detections.amfi_detect import AmfiConfigDetectLevel
 from ...base import PatchType
 
 from .....constants import Constants
@@ -25,10 +25,18 @@ def name(self) -> str:
         Display name for end users
         """
         return f"{self.hardware_variant()}: LaunchPad ({self._constants.launchpad_version})"
+    def required_amfi_level(self) -> AmfiConfigDetectLevel:
+        """
+        What level of AMFI configuration is required for this patch set
+        Currently defaulted to AMFI needing to be disabled
+        """
+        return AmfiConfigDetectLevel.NO_CHECK
+
 
 
     def present(self) -> bool:
         return self._constants.change_launchpad
+        
     def requires_kernel_debug_kit(self) -> bool:
         """
         Apple no longer provides standalone kexts in the base OS
@@ -51,9 +59,9 @@ def hardware_variant(self) -> HardwareVariant:
         return HardwareVariant.MISCELLANEOUS
 
 
-    def _modern_audio_patches(self) -> dict:
+    def _launchpad_patches(self) -> dict:
         """
-        Patches for Modern Audio
+        Patches for LaunchPad   
         """
         if self._constants.launchpad_version != "26.0 Beta 4" and self._constants.launchpad_version != "26.0 Beta 2":
             self._constants.launchpad_version = "26.0 Beta 4"
@@ -80,4 +88,4 @@ def patches(self) -> dict:
         if self.native_os() is True:
             return {}
 
-        return self._modern_audio_patches()
+        return self._launchpad_patches()

oclp_r/sys_patch/patchsets/hardware/misc/apfs_aligned.py

@@ -3,7 +3,7 @@
 """
 
 from ..base import BaseHardware, HardwareVariant
-
+from .....detections.amfi_detect import AmfiConfigDetectLevel
 from ...base import PatchType
 
 from .....constants import Constants
@@ -18,7 +18,12 @@ class APFSP(BaseHardware):
     def __init__(self, xnu_major, xnu_minor, os_build, global_constants: Constants) -> None:
         super().__init__(xnu_major, xnu_minor, os_build, global_constants)
 
-
+    def required_amfi_level(self) -> AmfiConfigDetectLevel:
+        """
+        What level of AMFI configuration is required for this patch set
+        Currently defaulted to AMFI needing to be disabled
+        """
+        return AmfiConfigDetectLevel.NO_CHECK
     def name(self) -> str:
         """
         Display name for end users

oclp_r/sys_patch/patchsets/hardware/misc/modern_audio.py

@@ -3,7 +3,7 @@
 """
 
 from ..base import BaseHardware, HardwareVariant
-
+from .....detections.amfi_detect import AmfiConfigDetectLevel
 from ...base import PatchType
 
 from .....constants import Constants
@@ -18,7 +18,12 @@ class ModernAudio(BaseHardware):
     def __init__(self, xnu_major, xnu_minor, os_build, global_constants: Constants) -> None:
         super().__init__(xnu_major, xnu_minor, os_build, global_constants)
 
-
+    def required_amfi_level(self) -> AmfiConfigDetectLevel:
+        """
+        What level of AMFI configuration is required for this patch set
+        Currently defaulted to AMFI needing to be disabled
+        """
+        return AmfiConfigDetectLevel.NO_CHECK
     def name(self) -> str:
         """
         Display name for end users

oclp_r/sys_patch/patchsets/hardware/misc/modern_usb.py

@@ -3,7 +3,7 @@
 """
 
 from ..base import BaseHardware, HardwareVariant
-
+from .....detections.amfi_detect import AmfiConfigDetectLevel
 from ...base import PatchType
 
 from .....constants import Constants
@@ -16,6 +16,14 @@ class LegacyUSBHost(BaseHardware):
     def __init__(self, xnu_major, xnu_minor, os_build, global_constants: Constants) -> None:
         super().__init__(xnu_major, xnu_minor, os_build, global_constants)
 
+    def required_amfi_level(self) -> AmfiConfigDetectLevel:
+        """
+        What level of AMFI configuration is required for this patch set
+        Currently defaulted to AMFI needing to be disabled
+        """
+        return AmfiConfigDetectLevel.NO_CHECK
+
+
 
     def name(self) -> str:
         """

oclp_r/sys_patch/patchsets/hardware/misc/voodoo_audio.py

@@ -1,6 +1,7 @@
 """
 voodoo_audio.py: Modern Audio patch set for macOS 12+26(VoodooHDA)
 """
+from .....detections.amfi_detect import AmfiConfigDetectLevel
 from ..base import BaseHardware, HardwareVariant
 from ...base import PatchType
 from .....constants import Constants
@@ -18,11 +19,17 @@ def name(self) -> str:
         """
         return f"{self.hardware_variant()}: Voodoo Audio"
 
+    def required_amfi_level(self) -> AmfiConfigDetectLevel:
+        """
+        What level of AMFI configuration is required for this patch set
+        Currently defaulted to AMFI needing to be disabled
+        """
+        return AmfiConfigDetectLevel.NO_CHECK
 
     def present(self) -> bool:
         return self._constants.audio_type=="VoodooHDA"
 
-
+    
     def native_os(self) -> bool:
         if self._xnu_major < os_data.monterey.value:
             return True