fix kdk handler bugs

Author: pyquick

oclp_r/support/kdk_handler.py

@@ -283,24 +283,18 @@ def retrieve_download(self, override_path: str = "") -> network_handler.Download
             logging.info("No download required, KDK already installed")
             self.success = True
             return None
-
         if self.kdk_url == "":
             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,self.size)
+        return network_handler.DownloadObject(self.kdk_url, kdk_download_path)
 
 
     def _generate_kdk_info_plist(self, plist_path: str) -> None:

oclp_r/support/network_handler.py

@@ -261,6 +261,11 @@ def _get_filename(self) -> str:
         return Path(self.url).name
 
     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:
@@ -354,7 +359,7 @@ def _download(self, display_progress: bool = False) -> None:
             if self._prepare_working_directory(self.filepath) is False:
                 raise Exception(self.error_msg)
 
-            response = NetworkUtilities().get(self.url, stream=True, timeout=10)
+            response = NetworkUtilities().get(self.url, stream=True, timeout=100)
 
             with open(self.filepath, 'wb') as file:
                 atexit.register(self.stop)
@@ -437,7 +442,6 @@ def get_file_size(self) -> float:
         Returns:
             float: The file size in bytes, or 0.0 if unknown
         """
-
         return self.total_file_size
 
 

oclp_r/wx_gui/gui_kdk_dl.py

@@ -268,8 +268,8 @@ def is_dir_writable(dirpath):
             file_name = selected_installer['name']+".dmg"
             self.frame_modal.Close()
             self.path_validate=self.constants.user_download_file+"/"+file_name
-            size=selected_installer['fileSize']
-            download_obj = network_handler.DownloadObject(selected_installer['url'], self.constants.user_download_file+"/"+file_name,self.convert_size(size))
+            size=int(selected_installer['fileSize'])
+            download_obj = network_handler.DownloadObject(selected_installer['url'], self.constants.user_download_file+"/"+file_name,size)
             gui_download.DownloadFrame(
                 self,
                 title=self.title,