fix size convert

Author: pyquick

OCLP-R-GUI.spec

@@ -25,7 +25,6 @@ datas = [
 if Path("HackdocInternalResources.dmg").exists():
    datas.append(('HackdocInternalResources.dmg', '.'))
 
-
 a = Analysis(['OCLP-R-GUI.command'],
              pathex=[],
              binaries=[],
@@ -85,3 +84,4 @@ app = BUNDLE(coll,
                 "NSPrincipalClass": "NSApplication",
                 "CFBundleIconName": "oclp",
              })
+

oclp_r/constants.py

@@ -891,4 +891,4 @@ def icons_path(self):
         "Mac-942B59F58194171B",  # iMac12,2
         "Mac-94245AF5819B141B",  # AppleInternal MacBookPro8,3
         "Mac-942B5B3A40C91381",  # AppleInternal iMac12,2
-    ]
+    ]

oclp_r/support/kdk_handler.py

@@ -74,7 +74,7 @@ def __init__(self, global_constants: constants.Constants,
         self.kdk_url:         str = ""
         self.kdk_url_build:   str = ""
         self.kdk_url_version: str = ""
-
+        self.size=0
         self.kdk_url_expected_size: int = 0
 
         self.kdk_url_is_exactly_match: bool = False
@@ -259,7 +259,12 @@ def _get_latest_kdk(self, host_build: str = None, host_version: str = None) -> N
 
         self.success = True
 
-
+    def convert_size(self, 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:
+               return float(size_str.replace(unit, '')) * factor
+        return float(size_str)
     def retrieve_download(self, override_path: str = "") -> network_handler.DownloadObject:
         """
         Returns a DownloadObject for the KDK
@@ -283,15 +288,19 @@ def retrieve_download(self, override_path: str = "") -> network_handler.Download
             self.error_msg = "Could not retrieve KDK catalog, no KDK to download"
             logging.error(self.error_msg)
             return None
-
+        re=requests.get(self.kdk_url)
+        json=re.json()
+        for i in json:
+            if i["build"]==self.kdk_url_build:
+                self.size=self.convert_size(i["fileSize"])
         logging.info(f"Returning DownloadObject for KDK: {Path(self.kdk_url).name}")
         self.success = True
 
         kdk_download_path = self.constants.kdk_download_path if override_path == "" else Path(override_path)
         kdk_plist_path = Path(f"{kdk_download_path.parent}/{KDK_INFO_PLIST}") if override_path == "" else Path(f"{Path(override_path).parent}/{KDK_INFO_PLIST}")
 
         self._generate_kdk_info_plist(kdk_plist_path)
-        return network_handler.DownloadObject(self.kdk_url, kdk_download_path)
+        return network_handler.DownloadObject(self.kdk_url, kdk_download_path,self.size)
 
 
     def _generate_kdk_info_plist(self, plist_path: str) -> None:

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

@@ -66,7 +66,6 @@ def _modern_audio_patches(self) -> dict:
                     },
                     "/System/Applications": {
                         "Apps.app":      f"{self._constants.launchpad_version}",
-                        "Launchpad.app":      f"{self._constants.launchpad_version}",
                     },
                 },
             },

oclp_r/wx_gui/gui_sys_patch_start.py

@@ -55,7 +55,12 @@ def __init__(self, parent: wx.Frame, title: str, global_constants: constants.Con
 
         if self.patches == {}:
             self.patches = HardwarePatchsetDetection(constants=self.constants).device_properties
-
+    def convert_size(self, 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:
+               return float(size_str.replace(unit, '')) * factor
+        return float(size_str)
 
     def _kdk_download(self, frame: wx.Frame = None) -> bool:
         frame = self if not frame else frame
@@ -79,7 +84,7 @@ def _kdk_download(self, frame: wx.Frame = None) -> bool:
         # Set size of frame
         frame.SetSize((-1, progress_bar.GetPosition()[1] + progress_bar.GetSize()[1] + 35))
         frame.Show()
-
+       
         # Generate KDK object
         self.kdk_obj: kdk_handler.KernelDebugKitObject = None
         def _kdk_thread_spawn():
@@ -100,7 +105,7 @@ def _kdk_thread_spawn():
         if not kdk_download_obj:
             # KDK is already downloaded
             return True
-
+        
         gui_download.DownloadFrame(
             self,
             title=self.title,

payloads/Icon/AppIcons/AppIcon.icns

@@ -0,0 +1,11 @@
+a=[
+    {
+        "build":"1",
+    },
+    {
+        "build":"2",
+    },
+    {
+        "build":"3",
+    },
+]