Upstream/gibMacOS
1
0
Fork 0
mirror of https://github.com/corpnewt/gibMacOS.git synced 2024-12-04 13:33:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare downloaded size to Content-Length if available

Browse Source
This commit is contained in:
CorpNewt 2023-12-08 02:49:49 -06:00 committed by GitHub
parent ce2ef58bb5
commit 9bb16b1e1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Scripts/downloader.py
View File

@ -35,7 +35,7 @@ class Downloader:
def open_url(self, url, headers = None): def open_url(self, url, headers = None):
# Fall back on the default ua if none provided # Fall back on the default ua if none provided
headers = self.ua if headers == None else headers headers = self.ua if headers is None else headers
# Wrap up the try/except block so we don't have to do this for each function # Wrap up the try/except block so we don't have to do this for each function
try: try:
response = urlopen(Request(url, headers=headers), context=self.ssl_context) response = urlopen(Request(url, headers=headers), context=self.ssl_context)
@ -92,12 +92,12 @@ class Downloader:
def get_string(self, url, progress = True, headers = None, expand_gzip = True): def get_string(self, url, progress = True, headers = None, expand_gzip = True):
response = self.get_bytes(url,progress,headers,expand_gzip) response = self.get_bytes(url,progress,headers,expand_gzip)
if response == None: return None if response is None: return None
return self._decode(response) return self._decode(response)
def get_bytes(self, url, progress = True, headers = None, expand_gzip = True): def get_bytes(self, url, progress = True, headers = None, expand_gzip = True):
response = self.open_url(url, headers) response = self.open_url(url, headers)
if response == None: return None if response is None: return None
bytes_so_far = 0 bytes_so_far = 0
try: total_size = int(response.headers['Content-Length']) try: total_size = int(response.headers['Content-Length'])
except: total_size = -1 except: total_size = -1
@ -115,9 +115,9 @@ class Downloader:
if progress: print("") # Add a newline so our last progress prints completely if progress: print("") # Add a newline so our last progress prints completely
return chunk_so_far return chunk_so_far
def stream_to_file(self, url, file_path, progress = True, headers = None): def stream_to_file(self, url, file_path, progress = True, headers = None, ensure_size_if_present = True):
response = self.open_url(url, headers) response = self.open_url(url, headers)
if response == None: return None if response is None: return None
bytes_so_far = 0 bytes_so_far = 0
try: total_size = int(response.headers['Content-Length']) try: total_size = int(response.headers['Content-Length'])
except: total_size = -1 except: total_size = -1
@ -129,4 +129,8 @@ class Downloader:
if not chunk: break if not chunk: break
f.write(chunk) f.write(chunk)
if progress: print("") # Add a newline so our last progress prints completely if progress: print("") # Add a newline so our last progress prints completely
if ensure_size_if_present and total_size != -1:
# We're verifying size - make sure we got what we asked for
if bytes_so_far != total_size:
return None # We didn't - imply it failed
return file_path if os.path.exists(file_path) else None return file_path if os.path.exists(file_path) else None