From 875e77b0d1ebad414e49a1f263e0d81143b724bb Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 2 Nov 2021 09:58:09 -0600 Subject: [PATCH] Clean up download_file function --- .gitignore | 3 +++ data/pci_data.py | 8 -------- resources/utilities.py | 10 +++++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index c2d213861..491ca770d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ OCLP-GUI.command /payloads/Apple /payloads/*.zip +/payloads/BuildManifest.plist +/payloads/*.sucatalog +/payloads/*.pkg /payloads/__MACOSX /App /Build-Folder diff --git a/data/pci_data.py b/data/pci_data.py index b4441db58..82a434720 100644 --- a/data/pci_data.py +++ b/data/pci_data.py @@ -536,14 +536,6 @@ class amd_ids: 0x6810, # R7 370 / R9 270X/370X 0x6818, # HD 7870 0x6819, # HD 7850 / R7 265 / R9 270 1024SP - # AMDPitcairnGraphicsAccelerator - AMD7000Controller - 0x6800, # HD 7970M - 0x6801, # HD 8970M - 0x6806, # Unknown - 0x6808, # W7000 - 0x6810, # R7 370 / R9 270X/370X - 0x6818, # HD 7870 - 0x6819, # HD 7850 / R7 265 / R9 270 1024SP # AMDTahitiGraphicsAccelerator - AMD7000Controller 0x6790, # Unknown 0x6798, # HD 7970/8970 OEM / R9 280X / D700 diff --git a/resources/utilities.py b/resources/utilities.py index cfa244496..6f5fce1ae 100644 --- a/resources/utilities.py +++ b/resources/utilities.py @@ -291,10 +291,7 @@ def get_rom(variable: str, *, decode: bool = False): def download_file(link, location): - print("- Attempting download from following link:") - print(link) if Path(location).exists(): - print("- Removing old file") Path(location).unlink() response = requests.get(link, stream=True) with location.open("wb") as file: @@ -303,8 +300,11 @@ def download_file(link, location): file.write(chunk) count += len(chunk) cls() - print("- Downloading package") - print(f"- {count / 1024 / 1024}MB Downloaded") + print("####################") + print("# Downloading file #") + print("####################") + print(link) + print(f"{count / 1024 / 1024}MB Downloaded") checksum = hashlib.sha256() with location.open("rb") as file: chunk = file.read(1024 * 1024 * 16)