timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-04-20 18:54:30 +10:00
Code Issues Packages Projects Releases Wiki Activity

Adjust remaining functions to logging

Browse Source
This commit is contained in:
Mykola Grymalyuk
2023-02-02 17:52:46 -07:00
parent da45a964cb
commit f33cc2d5bb
3 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
resources/kdk_handler.py
View File

@@ -1,8 +1,6 @@
# Kernel Debug Kit downloader
import datetime
import re
import urllib.parse
from pathlib import Path
from typing import cast
@@ -11,6 +9,8 @@ import requests
import subprocess
import logging
from resources import utilities
from resources.constants import Constants
@@ -22,16 +22,16 @@ class kernel_debug_kit_handler:
def get_available_kdks(self):
KDK_API_LINK = "https://raw.githubusercontent.com/dortania/KdkSupportPkg/gh-pages/manifest.json"
print("- Fetching available KDKs")
logging.info("Fetching available KDKs")
try:
results = utilities.SESSION.get(KDK_API_LINK, headers={"User-Agent": f"OCLP/{self.constants.patcher_version}"}, timeout=10)
except (requests.exceptions.Timeout, requests.exceptions.TooManyRedirects, requests.exceptions.ConnectionError):
print("- Could not contact KDK API")
logging.info("- Could not contact KDK API")
return None
if results.status_code != 200:
print("- Could not fetch KDK list")
logging.info("- Could not fetch KDK list")
return None
return sorted(results.json(), key=lambda x: (packaging.version.parse(x["version"]), datetime.datetime.fromisoformat(x["date"])), reverse=True)
@@ -40,7 +40,7 @@ class kernel_debug_kit_handler:
detected_build = build
if self.is_kdk_installed(detected_build) is True:
print("- KDK is already installed")
logging.info("- KDK is already installed")
self.remove_unused_kdks(exclude_builds=[detected_build])
return True, "", detected_build
@@ -65,32 +65,32 @@ class kernel_debug_kit_handler:
closest_build = kdk["build"]
else:
msg = "Could not fetch KDK list"
print(f"- {msg}")
logging.info(f"- {msg}")
return False, msg, ""
print(f"- Checking for KDK matching macOS {version} build {build}")
logging.info(f"- Checking for KDK matching macOS {version} build {build}")
# download_link is None if no matching KDK is found, so we'll fall back to the closest match
if not download_link:
print("- Could not find KDK, finding closest match")
logging.info("- Could not find KDK, finding closest match")
if self.is_kdk_installed(closest_build) is True:
print(f"- Closest build ({closest_build}) already installed")
logging.info(f"- Closest build ({closest_build}) already installed")
self.remove_unused_kdks(exclude_builds=[detected_build, closest_build])
return True, "", closest_build
if closest_match_download_link is None:
msg = "Could not find KDK for host, nor closest match"
print(f"- {msg}")
logging.info(f"- {msg}")
return False, msg, ""
print(f"- Closest match: {closest_version} build {closest_build}")
logging.info(f"- Closest match: {closest_version} build {closest_build}")
download_link = closest_match_download_link
if utilities.verify_network_connection(download_link):
print("- Downloading KDK")
logging.info("- Downloading KDK")
else:
msg = "Could not contact download site"
print(f"- {msg}")
logging.info(f"- {msg}")
return False, msg, ""
result = utilities.download_file(download_link, self.constants.kdk_download_path)
@@ -99,15 +99,15 @@ class kernel_debug_kit_handler:
# TODO: should we use the checksum from the API?
result = subprocess.run(["hdiutil", "verify", self.constants.kdk_download_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if result.returncode != 0:
print("Error: Kernel Debug Kit checksum verification failed!")
print(f"Output: {result.stderr}")
logging.info("Error: Kernel Debug Kit checksum verification failed!")
logging.info(f"Output: {result.stderr}")
msg = "Kernel Debug Kit checksum verification failed, please try again.\n\nIf this continues to fail, ensure you're downloading on a stable network connection (ie. Ethernet)"
print(f"- {msg}")
logging.info(f"- {msg}")
return False, msg, ""
self.remove_unused_kdks(exclude_builds=[detected_build, closest_build])
return True, "", detected_build
msg = "Failed to download KDK"
print(f"- {msg}")
logging.info(f"- {msg}")
return False, msg, ""
def is_kdk_installed(self, build):
@@ -124,7 +124,7 @@ class kernel_debug_kit_handler:
if file.name.endswith(f"{build}.kdk"):
for kext in kexts_to_check:
if not Path(f"{file}/System/Library/Extensions/{kext}").exists():
print(f"- Corrupted KDK found, removing due to missing: {file}/System/Library/Extensions/{kext}")
logging.info(f"- Corrupted KDK found, removing due to missing: {file}/System/Library/Extensions/{kext}")
utilities.elevated(["rm", "-rf", file], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
return False
return True
@@ -140,7 +140,7 @@ class kernel_debug_kit_handler:
if exclude_builds == []:
return
print("- Cleaning unused KDKs")
logging.info("- Cleaning unused KDKs")
for kdk_folder in Path("/Library/Developer/KDKs").iterdir():
if kdk_folder.is_dir():
if kdk_folder.name.endswith(".kdk"):
@@ -151,7 +151,7 @@ class kernel_debug_kit_handler:
break
if should_remove is False:
continue
print(f" - Removing {kdk_folder.name}")
logging.info(f" - Removing {kdk_folder.name}")
utilities.elevated(["rm", "-rf", kdk_folder], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -161,17 +161,17 @@ class kernel_debug_kit_handler:
# Check if tag exists
catalog = requests.get(KDK_MIRROR_REPOSITORY)
if catalog.status_code != 200:
print(f"- Could not contact KDK mirror repository")
logging.info(f"- Could not contact KDK mirror repository")
return None
catalog = catalog.json()
for release in catalog:
if release["tag_name"] == build:
print(f"- Found KDK mirror for build: {build}")
logging.info(f"- Found KDK mirror for build: {build}")
for asset in release["assets"]:
if asset["name"].endswith(".dmg"):
return asset["browser_download_url"]
print(f"- Could not find KDK mirror for build {build}")
logging.info(f"- Could not find KDK mirror for build {build}")
return None