timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-04-23 19:40:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

kdk_handler: Clean up unused variables

Browse Source
This commit is contained in:
Dhinak G
2022-10-03 16:08:44 -04:00
parent fa352fbc0c
commit 4bebe208bc
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
resources/kdk_handler.py
View File

@@ -11,8 +11,6 @@ import requests
from resources import utilities from resources import utilities
from resources.constants import Constants from resources.constants import Constants
SESSION = requests.Session()
class kernel_debug_kit_handler: class kernel_debug_kit_handler:
def __init__(self, constants: Constants): def __init__(self, constants: Constants):
@@ -23,7 +21,7 @@ class kernel_debug_kit_handler:
print("- Fetching available KDKs") print("- Fetching available KDKs")
results = SESSION.get(KDK_API_LINK, headers={"User-Agent": f"OCLP/{self.constants.patcher_version}"}) results = utilities.SESSION.get(KDK_API_LINK, headers={"User-Agent": f"OCLP/{self.constants.patcher_version}"})
if results.status_code != 200: if results.status_code != 200:
print(" - Could not fetch KDK list") print(" - Could not fetch KDK list")
@@ -43,7 +41,7 @@ class kernel_debug_kit_handler:
print(f"- Checking closest match for: {host_version} build {host_build}") print(f"- Checking closest match for: {host_version} build {host_build}")
results = SESSION.get(OS_DATABASE_LINK) results = utilities.SESSION.get(OS_DATABASE_LINK)
if results.status_code != 200: if results.status_code != 200:
print(" - Could not fetch database") print(" - Could not fetch database")
@@ -85,7 +83,7 @@ class kernel_debug_kit_handler:
token_url = urllib.parse.urlunparse(urllib.parse.urlparse(TOKEN_URL_BASE)._replace(query=urllib.parse.urlencode({"path": remote_path}))) token_url = urllib.parse.urlunparse(urllib.parse.urlparse(TOKEN_URL_BASE)._replace(query=urllib.parse.urlencode({"path": remote_path})))
try: try:
response = SESSION.get(token_url, timeout=5) response = utilities.SESSION.get(token_url, timeout=5)
except (requests.exceptions.Timeout, requests.exceptions.TooManyRedirects, requests.exceptions.ConnectionError): except (requests.exceptions.Timeout, requests.exceptions.TooManyRedirects, requests.exceptions.ConnectionError):
print(" - Could not contact Apple download servers") print(" - Could not contact Apple download servers")
return 2 return 2
@@ -102,12 +100,11 @@ class kernel_debug_kit_handler:
return 0 return 0
def download_kdk(self, version: str, build: str): def download_kdk(self, version: str, build: str):
error_msg = ""
detected_build = build detected_build = build
if self.is_kdk_installed(build) is True: if self.is_kdk_installed(build) is True:
print(" - KDK is already installed") print(" - KDK is already installed")
return True, error_msg, detected_build return True, "", detected_build
download_link = None download_link = None
closest_match_download_link = None closest_match_download_link = None
@@ -140,11 +137,10 @@ class kernel_debug_kit_handler:
print(" - Could not find KDK, finding closest match") print(" - Could not find KDK, finding closest match")
if self.is_kdk_installed(closest_build) is True: if self.is_kdk_installed(closest_build) is True:
return True, error_msg, closest_build return True, "", closest_build
if closest_match_download_link is None: if closest_match_download_link is None:
error_msg = "Could not find KDK for host, nor closest match" return False, "Could not find KDK for host, nor closest match", ""
return False, error_msg, ""
result = self.verify_apple_developer_portal(closest_match_download_link) result = self.verify_apple_developer_portal(closest_match_download_link)
@@ -153,19 +149,15 @@ class kernel_debug_kit_handler:
download_link = closest_match_download_link download_link = closest_match_download_link
elif result == 1: elif result == 1:
print(" - Could not find KDK") print(" - Could not find KDK")
error_msg = "Could not find KDK for host on Apple's servers, nor closest match" return False, "Could not find KDK for host on Apple's servers, nor closest match", ""
return False, error_msg, ""
elif result == 2: elif result == 2:
error_msg = "Could not contact Apple download servers" return False, "Could not contact Apple download servers", ""
return False, error_msg, ""
elif result == 2: elif result == 2:
error_msg = "Could not contact Apple download servers" return False, "Could not contact Apple download servers", ""
return False, error_msg, ""
if utilities.download_apple_developer_portal(download_link, self.constants.kdk_download_path): if utilities.download_apple_developer_portal(download_link, self.constants.kdk_download_path):
return True, error_msg, detected_build return True, "", detected_build
error_msg = "Failed to download KDK" return False, "Failed to download KDK", ""
return False, error_msg, ""
def is_kdk_installed(self, build): def is_kdk_installed(self, build):
if Path("/Library/Developer/KDKs").exists(): if Path("/Library/Developer/KDKs").exists():