Finish migration to network_handler.py usage

resources/sys_patch/sys_patch.py

@@ -40,7 +40,7 @@ from datetime import datetime
 import logging
 
 from resources import constants, utilities, kdk_handler
-from resources.sys_patch import sys_patch_download, sys_patch_detect, sys_patch_auto, sys_patch_helpers
+from resources.sys_patch import sys_patch_detect, sys_patch_auto, sys_patch_helpers
 
 from data import os_data
 
@@ -661,42 +661,12 @@ class PatchSysVolume:
 
     def check_files(self):
         if Path(self.constants.payload_local_binaries_root_path).exists():
-            logging.info("- Found local Apple Binaries")
-            if self.constants.gui_mode is False:
-                patch_input = input("Would you like to redownload?(y/n): ")
-                if patch_input in {"y", "Y", "yes", "Yes"}:
-                    shutil.rmtree(Path(self.constants.payload_local_binaries_root_path))
-                    output = self.download_files()
-                else:
-                    output = True
-            else:
-                output = self.download_files()
-        else:
-            output = self.download_files()
-        return output
+            logging.info("- Local PatcherSupportPkg resources available, continuing...")
+            return True
 
-    def download_files(self):
-        if self.constants.cli_mode is True:
-            download_result, link = sys_patch_download.grab_patcher_support_pkg(self.constants).download_files()
-        else:
-            download_result = True
-            link = sys_patch_download.grab_patcher_support_pkg(self.constants).generate_pkg_link()
+        logging.info("- PatcherSupportPkg resources missing, Patcher likely corrupted!!!")
+        return False
 
-        if download_result and self.constants.payload_local_binaries_root_path_zip.exists():
-            logging.info("- Unzipping binaries...")
-            utilities.process_status(subprocess.run(["ditto", "-V", "-x", "-k", "--sequesterRsrc", "--rsrc", self.constants.payload_local_binaries_root_path_zip, self.constants.payload_path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
-            logging.info("- Binaries downloaded to:")
-            logging.info(self.constants.payload_path)
-            return self.constants.payload_local_binaries_root_path
-        else:
-            if self.constants.gui_mode is True:
-                logging.info("- Download failed, please verify the below link work:")
-                logging.info(link)
-                logging.info("\nIf you continue to have issues, try using the Offline builds")
-                logging.info("located on Github next to the other builds")
-            else:
-                input("\nPress enter to continue")
-        return None
 
     # Entry Function
     def start_patch(self):

resources/sys_patch/sys_patch_auto.py

@@ -13,7 +13,7 @@ import plistlib
 import subprocess
 import webbrowser
 import logging
-from resources import utilities, updates, global_settings
+from resources import utilities, updates, global_settings, network_handler
 from resources.sys_patch import sys_patch_detect
 from resources.gui import gui_main
 
@@ -55,7 +55,7 @@ class AutomaticSysPatch:
                         args_string = f"{self.constants.launcher_binary} {self.constants.launcher_script} --gui_patch"
 
                     warning_str = ""
-                    if utilities.verify_network_connection("https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest") is False:
+                    if network_handler.NetworkUtilities("https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest").verify_network_connection() is False:
                         warning_str = f"""\n\nWARNING: We're unable to verify whether there are any new releases of OpenCore Legacy Patcher on Github. Be aware that you may be using an outdated version for this OS. If you're unsure, verify on Github that OpenCore Legacy Patcher {self.constants.patcher_version} is the latest official release"""
 
                     args = [

resources/sys_patch/sys_patch_detect.py

@@ -3,7 +3,7 @@
 # Used when supplying data to sys_patch.py
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
-from resources import constants, device_probe, utilities, amfi_detect
+from resources import constants, device_probe, utilities, amfi_detect, network_handler
 from resources.sys_patch import sys_patch_helpers
 from data import model_array, os_data, sip_data, sys_patch_dict, smbios_data, cpu_data
 
@@ -402,7 +402,7 @@ class detect_root_patch:
         return False
 
     def detect_patch_set(self):
-        self.has_network = utilities.verify_network_connection()
+        self.has_network = network_handler.NetworkUtilities().verify_network_connection()
 
         if self.check_uhci_ohci() is True:
             self.legacy_uhci_ohci = True

resources/sys_patch/sys_patch_download.py

@@ -1,33 +0,0 @@
-# Download PatcherSupportPkg for usage with Root Patching
-# Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
-
-from resources import utilities
-from pathlib import Path
-import shutil
-import logging
-
-class grab_patcher_support_pkg:
-
-    def __init__(self, constants):
-        self.constants = constants
-
-    def generate_pkg_link(self):
-        link = f"{self.constants.url_patcher_support_pkg}{self.constants.patcher_support_pkg_version}/Universal-Binaries.zip"
-        return link
-
-    def download_files(self):
-        link = self.generate_pkg_link()
-        if Path(self.constants.payload_local_binaries_root_path).exists():
-            logging.info("- Removing old Root Patcher Payload folder")
-            # Delete folder
-            shutil.rmtree(self.constants.payload_local_binaries_root_path)
-
-        download_result = None
-        if Path(self.constants.payload_local_binaries_root_path_zip).exists():
-            logging.info(f"- Found local Universal-Binaries.zip, skipping download")
-            download_result = True
-        else:
-            logging.info(f"- No local version found, downloading...")
-            download_result = utilities.download_file(link, self.constants.payload_local_binaries_root_path_zip)
-
-        return download_result, link