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

utilities.py: Fix 100%+ download reporting

Browse Source
This commit is contained in:
Mykola Grymalyuk
2022-01-16 13:41:34 -07:00
parent a56f3af99c
commit b8bdab3576
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/gui_main.py
+1
View File
@@ -981,6 +981,7 @@ class wx_python_gui:
self.return_to_main_menu.Bind(wx.EVT_BUTTON, self.main_menu) self.return_to_main_menu.Bind(wx.EVT_BUTTON, self.main_menu)
self.return_to_main_menu.Centre(wx.HORIZONTAL) self.return_to_main_menu.Centre(wx.HORIZONTAL)
self.frame.SetSize(-1, self.return_to_main_menu.GetPosition().y + self.return_to_main_menu.GetSize().height + 40)
self.frame.Show() self.frame.Show()
# Download installer catalog # Download installer catalog
resources/utilities.py
+12 -3
View File
@@ -314,20 +314,29 @@ def verify_network_connection(url):
def download_file(link, location, is_gui=None): def download_file(link, location, is_gui=None):
if verify_network_connection(link): if verify_network_connection(link):
short_link = os.path.basename(link)
if Path(location).exists(): if Path(location).exists():
Path(location).unlink() Path(location).unlink()
header = requests.head(link).headers
try:
# Try to get true file
# ex. Github's release links provides a "fake" header
# Thus need to resolve to the real link
link = requests.head(link).headers["location"]
header = requests.head(link).headers
except KeyError:
pass
try: try:
# Handle cases where Content-Length has garbage or is missing # Handle cases where Content-Length has garbage or is missing
total_file_size = int(requests.head(link).headers['Content-Length']) total_file_size = int(requests.head(link).headers['Content-Length'])
except KeyError: except KeyError:
total_file_size = 0 total_file_size = 0
if total_file_size != 0: if total_file_size > 1024:
file_size_rounded = round(total_file_size / 1024 / 1024, 2) file_size_rounded = round(total_file_size / 1024 / 1024, 2)
file_size_string = f" of {file_size_rounded}MB" file_size_string = f" of {file_size_rounded}MB"
else: else:
file_size_string = "" file_size_string = ""
response = requests.get(link, stream=True) response = requests.get(link, stream=True)
short_link = os.path.basename(link)
# SU Catalog's link is quite long, strip to make it bearable # SU Catalog's link is quite long, strip to make it bearable
if "sucatalog.gz" in short_link: if "sucatalog.gz" in short_link:
short_link = "sucatalog.gz" short_link = "sucatalog.gz"
@@ -349,7 +358,7 @@ def download_file(link, location, is_gui=None):
print(header) print(header)
print(box_string) print(box_string)
print("") print("")
if total_file_size != 0: if total_file_size > 1024:
total_downloaded_string = f" ({round(float(dl / total_file_size * 100), 2)}%)" total_downloaded_string = f" ({round(float(dl / total_file_size * 100), 2)}%)"
print(f"{round(count / 1024 / 1024, 2)}MB Downloaded{file_size_string}{total_downloaded_string}\nAverage Download Speed: {round(dl//(time.perf_counter() - start) / 100000 / 8, 2)} MB/s") print(f"{round(count / 1024 / 1024, 2)}MB Downloaded{file_size_string}{total_downloaded_string}\nAverage Download Speed: {round(dl//(time.perf_counter() - start) / 100000 / 8, 2)} MB/s")
checksum = hashlib.sha256() checksum = hashlib.sha256()