Improve KDK & Metallib download

Author: pyquick

oclp_r/constants.py

@@ -12,6 +12,10 @@
 import getpass
 class Constants:
     def __init__(self) -> None:
+        #API Link
+        self.kdk_api_link:                    str = ""
+        self.metallib_api_link:               str = ""
+
         # Patcher Versioning
         self.patcher_version:                 str = "3.0.0"  # OCLP-R
         self.patcher_support_pkg_version:     str = "1.10.1-pre"  # PatcherSupportPkg
@@ -29,7 +33,7 @@ def __init__(self) -> None:
         self.user_download_file:              str = f"/Users/{getpass.getuser()}/Downloads"
         # OpenCore Versioning
         # https://github.com/acidanthera/OpenCorePkg
-        self.opencore_version: str = "1.0.5"
+        self.opencore_version: str = "1.0.6"
 
         # Kext Versioning
         ## Acidanthera
@@ -264,7 +268,15 @@ def __init__(self) -> None:
         self.github_mirror: str = ""
         # Open Intel Wireless
         self.intel_wireless_tahoe: bool = False
+        self.api_link()
 
+    def api_link(self):
+        if self.github_proxy_link!="SimpleHac":
+            self.kdk_api_link="https://dortania.github.io/KdkSupportPkg/manifest.json"
+            self.metallib_api_link="https://dortania.github.io/MetallibSupportPkg/manifest.json"
+        if self.github_proxy_link=="SimpleHac":
+            self.kdk_api_link="https://next.oclpapi.simplehac.cn/KdkSupportPkg/manifest.json"
+            self.metallib_api_link="https://next.oclpapi.simplehac.cn/MetallibSupportPkg/manifest.json"
     @property
     def special_build(self):
         """
@@ -800,30 +812,58 @@ def icon_path_ssd(self):
     def icon_path_macos_generic(self):
         return self.icns_resource_path / Path("Generic.icns")
 
+    @property
+    def package_icns_path_generic(self):
+        return self.icns_resource_path / Path("Package.icns")
+
     @property
     def icon_path_macos_big_sur(self):
         return self.icns_resource_path / Path("BigSur.icns")
 
+    @property
+    def package_icns_path_big_sur(self):
+        return self.icns_resource_path / Path("Package11.icns")
+
     @property
     def icon_path_macos_monterey(self):
         return self.icns_resource_path / Path("Monterey.icns")
 
+    @property
+    def package_icns_path_monterey(self):
+        return self.icns_resource_path / Path("Package12.icns")
+
     @property
     def icon_path_macos_ventura(self):
         return self.icns_resource_path / Path("Ventura.icns")
 
+    @property
+    def package_icns_path_ventura(self):
+        return self.icns_resource_path / Path("Package13.icns")
+
     @property
     def icon_path_macos_sonoma(self):
         return self.icns_resource_path / Path("Sonoma.icns")
 
+    @property
+    def package_icns_path_sonoma(self):
+        return self.icns_resource_path / Path("Package14.icns")
+
     @property
     def icon_path_macos_sequoia(self):
         return self.icns_resource_path / Path("Sequoia.icns")
 
+    @property
+    def package_icns_path_sequoia(self):
+        return self.icns_resource_path / Path("Package15.icns")
+
     @property
     def icon_path_macos_tahoe(self):
         return self.icns_resource_path / Path("Tahoe.icns")
 
+    @property
+    def package_icns_path_tahoe(self):
+        return self.icns_resource_path / Path("Package26.icns")
+
     @property
     def gui_path(self):
         return self.payload_path / Path("Icon/Resources.zip")
@@ -861,6 +901,18 @@ def icons_path(self):
             str(self.icon_path_macos_tahoe),
         ]
 
+    @property
+    def package_icns_paths(self):
+        return [
+            str(self.package_icns_path_generic),
+            str(self.package_icns_path_big_sur),
+            str(self.package_icns_path_monterey),
+            str(self.package_icns_path_ventura),
+            str(self.package_icns_path_sonoma),
+            str(self.package_icns_path_sequoia),
+            str(self.package_icns_path_tahoe),
+        ]
+
     sbm_values = [
         "j137ap",  #  iMacPro1,1
         "j680ap",  #  MacBookPro15,1

oclp_r/support/kdk_handler.py

@@ -21,11 +21,12 @@
     network_handler,
     subprocess_wrapper
 )
-
+from ..constants import Constants
 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://next.oclpapi.simplehac.cn/KdkSupportPkg/manifest.json"
+
+
+
 KDK_ASSET_LIST:   list = None
 
 class KernelDebugKitObject:
@@ -59,7 +60,7 @@ def __init__(self, global_constants: constants.Constants,
         ) -> None:
 
         self.constants: constants.Constants = global_constants
-
+        self.KDK_API_LINK_ORG:     str  = self.constants.kdk_api_link
         self.host_build:   str = host_build    # ex. 20A5384c
         self.host_version: str = host_version  # ex. 11.0.1
 
@@ -108,10 +109,7 @@ def _get_remote_kdks(self) -> list:
             return KDK_ASSET_LIST
 
         try:
-            if self.constants.github_proxy_link!="SimpleHac":
-                KDK_API_LINK=KDK_API_LINK_ORG
-            else:
-                KDK_API_LINK=KDK_API_LINK_PROXY
+            KDK_API_LINK=self.KDK_API_LINK_ORG
             results = network_handler.NetworkUtilities().get(
                 KDK_API_LINK,
                 headers={
@@ -270,6 +268,11 @@ def _get_latest_kdk(self, host_build: str = None, host_version: str = None) -> N
         self.success = True
 
     def convert_size(self, size_str):
+        if isinstance(size_str, float):
+            return float(size_str)
+        if isinstance(size_str, int):
+            return float(size_str)
+
         units = {'KB': 1024, 'MB': 1024**2, 'GB': 1024**3, 'TB': 1024**4}
         for unit, factor in units.items():
             if unit in size_str:

oclp_r/support/metallib_handler.py

@@ -17,8 +17,8 @@
 
 
 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://next.oclpapi.simplehac.cn/MetallibSupportPkg/manifest.json"
+
+
 METALLIB_ASSET_LIST:   list = None
 
 
@@ -30,7 +30,7 @@ def __init__(self, global_constants: constants.Constants,
         ) -> None:
 
         self.constants: constants.Constants = global_constants
-
+        self.METALLIB_API_LINK_ORG:     str  = self.constants.metallib_api_link
         self.host_build:   str = host_build    # ex. 20A5384c
         self.host_version: str = host_version  # ex. 11.0.1
 
@@ -70,10 +70,7 @@ def _get_remote_metallibs(self) -> dict:
             return METALLIB_ASSET_LIST
 
         try:
-            if self.constants.github_proxy_link=="SimpleHac":
-                METALLIB_API_LINK=METALLIB_API_LINK_PROXY
-            else:
-                METALLIB_API_LINK=METALLIB_API_LINK_ORG
+            METALLIB_API_LINK=self.METALLIB_API_LINK_ORG
             results = network_handler.NetworkUtilities().get(
                 METALLIB_API_LINK,
                 headers={
@@ -93,6 +90,17 @@ def _get_remote_metallibs(self) -> dict:
 
         return METALLIB_ASSET_LIST
 
+    def _get_file_size(self, url: str) -> int:
+        try:
+            response = requests.head(url, verify=False, allow_redirects=True, timeout=10)
+            if response.status_code == 200:
+                content_length = response.headers.get('content-length')
+                if content_length:
+                    return int(content_length)
+        except Exception as e:
+            logging.warning(f"Cannot get file size {url}: {e}")
+        
+        return 0
 
     def _get_latest_metallib(self) -> None:
         """
@@ -158,6 +166,7 @@ def _get_latest_metallib(self) -> None:
             self.metallib_url = metallib["url"]
             self.metallib_url_build = metallib["build"]
             self.metallib_url_version = metallib["version"]
+            self.metallib_file_size = self._get_file_size(self.metallib_url)
             self.metallib_url_is_exactly_match = True
             break
 
@@ -176,6 +185,7 @@ def _get_latest_metallib(self) -> None:
                 self.metallib_closest_match_url = metallib["url"]
                 self.metallib_closest_match_url_build = metallib["build"]
                 self.metallib_closest_match_url_version = metallib["version"]
+                self.metallib_closest_match_file_size = self._get_file_size(self.metallib_closest_match_url)
                 self.metallib_url_is_exactly_match = False
                 break
 
@@ -190,6 +200,8 @@ def _get_latest_metallib(self) -> None:
             self.metallib_url = self.metallib_closest_match_url
             self.metallib_url_build = self.metallib_closest_match_url_build
             self.metallib_url_version = self.metallib_closest_match_url_version
+            self.metallib_file_size = self.metallib_closest_match_file_size
+
         else:
             logging.info(f"Direct match found for {self.host_build} ({self.host_version})")
 
@@ -206,10 +218,23 @@ def _get_latest_metallib(self) -> None:
         logging.info(f"- metallib Build: {self.metallib_url_build}")
         logging.info(f"- metallib Version: {self.metallib_url_version}")
         logging.info(f"- metallib URL: {self.metallib_url}")
+        logging.info(f"- metallib size: {self._format_file_size(self.metallib_file_size)}")
 
         self.success = True
 
-
+    def _format_file_size(self, size_bytes: int) -> str:
+        """
+        Format file size for display
+        """
+        if size_bytes == 0:
+            return "/"
+        size_names = ["B", "KB", "MB", "GB"]
+        i = 0
+        size = float(size_bytes)
+        while size >= 1024 and i < len(size_names) - 1:
+            size /= 1024.0
+            i += 1
+        return f"{size:.2f} {size_names[i]}"
     def _local_metallib_installed(self, match: str = None, check_version: bool = False) -> str:
         """
         Check if a metallib is already installed
@@ -258,7 +283,7 @@ def retrieve_download(self, override_path: str = "") -> network_handler.Download
         self.success = True
 
         metallib_download_path = self.constants.metallib_download_path if override_path == "" else Path(override_path)
-        return network_handler.DownloadObject(self.metallib_url, metallib_download_path)
+        return network_handler.DownloadObject(self.metallib_url, metallib_download_path, self.metallib_file_size)
 
 
     def install_metallib(self, metallib: str = None) -> None:

oclp_r/wx_gui/gui_kdk_dl.py

@@ -17,16 +17,14 @@
     utilities,
     network_handler,
 )
-KDK_API_LINK_ORIGIN:str  = "https://dortania.github.io/KdkSupportPkg/manifest.json"
-KDK_API_LINK_PROXY:str  = "https://next.oclpapi.simplehac.cn/KdkSupportPkg/manifest.json"
 class KDKDownloadFrame(wx.Frame):
     def __init__(self, parent: wx.Frame, title: str, global_constants: constants.Constants,screen_location: tuple = None):
         logging.info("Initializing KDK Download Frame")
         self.constants: constants.Constants = global_constants
         self.title: str = title
         self.parent: wx.Frame = parent
-        icon_path = str(self.constants.icns_resource_path / "Package.icns")
-        self.icons = [self._icon_to_bitmap(icon_path), self._icon_to_bitmap(icon_path, (64, 64))]
+    
+        self.icons = [[self._icon_to_bitmap(icon_path), self._icon_to_bitmap(icon_path, (64, 64))] for icon_path in self.constants.package_icns_paths]
         self.repl=False
         self.path_validate=None
         self.retry_download:bool=False
@@ -42,8 +40,20 @@ def __init__(self, parent: wx.Frame, title: str, global_constants: constants.Con
         self.catalog_seed: sucatalog.SeedType = sucatalog.SeedType.DeveloperSeed
         self.frame_modal = wx.Dialog(parent, title=title, size=(330, 200))
         self.on_download()
+
     def _icon_to_bitmap(self, icon: str, size: tuple = (32, 32)) -> wx.Bitmap:
         return wx.Bitmap(wx.Bitmap(icon, wx.BITMAP_TYPE_ICON).ConvertToImage().Rescale(size[0], size[1], wx.IMAGE_QUALITY_HIGH))
+
+    def _macos_version_to_icon(self, version: int) -> int:
+        """
+        Convert macOS version to icon(Package)
+        """
+        try:
+            self.constants.package_icns_paths[version-19]
+            return version - 19
+        except IndexError:
+            return 0
+
     def _generate_catalog_frame(self) -> None:
         super(KDKDownloadFrame, self).__init__(None, title=self.title, size=(300, 200), style=wx.DEFAULT_FRAME_STYLE & ~(wx.RESIZE_BORDER | wx.MAXIMIZE_BOX))
         gui_support.GenerateMenubar(self, self.constants).generate()
@@ -59,10 +69,7 @@ def _generate_catalog_frame(self) -> None:
         self.Show()
         def _fetch_installers():
             try:
-                if self.constants.github_proxy_link=="SimpleHac":
-                    KDK_API_LINK:str=KDK_API_LINK_PROXY
-                else:
-                    KDK_API_LINK: str = KDK_API_LINK_ORIGIN
+                KDK_API_LINK=self.constants.kdk_api_link
                 response = requests.get(KDK_API_LINK,verify=False)
                 self.kdk_data = response.json()
                 self.kdk_data_latest = []
@@ -127,12 +134,14 @@ def _fetch_installers():
             self.on_return_to_main_menu()
         else:
             self._display_available_installers()
+
     def convert_size(self,size_bytes):
         for unit in ['B', 'KB', 'MB', 'GB']:
             if size_bytes < 1024.0:
                 return f"{size_bytes:.2f} {unit}"
             size_bytes /= 1024.0
         return f"{size_bytes:.2f} TB"
+
     def detect_os_build(self, rsr: bool = False) -> str:
         import plistlib
         file_path = "/System/Library/CoreServices/SystemVersion.plist"
@@ -142,13 +151,14 @@ def detect_os_build(self, rsr: bool = False) -> str:
             return plistlib.load(open(file_path, "rb"))["ProductBuildVersion"]
         except Exception as e:
             raise RuntimeError(f"Failed to detect OS build: {e}")
+
     def _display_available_installers(self, event: wx.Event = None, show_full: bool = False) -> None:
         if show_full:
             self.show_fully=True
         else:
             self.show_fully=False
         self.os_build_tahoe=self.detect_os_build(False)
-        bundles = [wx.BitmapBundle.FromBitmaps(self.icons)]
+        bundles = [wx.BitmapBundle.FromBitmaps(icon) for icon in self.icons]
         self.frame_modal.Destroy()
         self.frame_modal = wx.Dialog(self, title="Choose KDK Version", size=(500, 580))
         title_label = wx.StaticText(self.frame_modal, label="Choose KDKs", pos=(-1,-1))
@@ -178,7 +188,7 @@ def _display_available_installers(self, event: wx.Event = None, show_full: bool
                 logging.info(f"- {item['name']} (macOS {item['version']} - {item['build']}):\n  - Size: {self.convert_size(item['fileSize'])}\n  - Link: {item['url']}\n")
                 version = re.search(r'^\d+', item['version'])
                 index = self.list.InsertItem(self.list.GetItemCount(), f"macOS {xnu_name[version.group()]}")
-                self.list.SetItemImage(index, 0)
+                self.list.SetItemImage(index, self._macos_version_to_icon(int(item['build'][:2])))
                 self.list.SetItem(index, 1, f"{item['version']}")
                 self.list.SetItem(index, 2, f"{item['build']}")
                 self.list.SetItem(index, 3, f"{self.convert_size(item['fileSize'])}")
@@ -280,7 +290,7 @@ def is_dir_writable(dirpath):
                 global_constants=self.constants,
                 download_obj=download_obj,
                 item_name=f"KDK {selected_installer['version']} {selected_installer['build']}",
-                download_icon=str(self.constants.icns_resource_path / "Package.icns")
+                download_icon=self.constants.package_icns_paths[self._macos_version_to_icon(int(selected_installer['build'][:2]))]
             )
             if download_obj.download_complete is False:
                 import os

oclp_r/wx_gui/gui_macos_installer_download.py

@@ -73,12 +73,11 @@ def _macos_version_to_icon(self, version: int) -> int:
         Convert macOS version to icon
         """
         try:
-            self.constants.icons_path[version - 19]
+            self.constants.icons_path[version-19]
             return version - 19
         except IndexError:
             return 0
-
-
+    
     def _generate_elements(self, frame: wx.Frame = None) -> None:
         """
         Format: