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

Fix gzipped results

Browse Source 
Yes i sneaked size into here shh
This commit is contained in:
Dhinak G 2020-10-01 15:33:32 -04:00
parent 64f98e0c63
commit 996d067a38
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Scripts/downloader.py
View File

@ -1,4 +1,5 @@
import sys, os, time, ssl import sys, os, time, ssl, gzip
from io import BytesIO
# Python-aware urllib stuff # Python-aware urllib stuff
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
from urllib.request import urlopen, Request from urllib.request import urlopen, Request
@ -130,6 +131,10 @@ class Downloader:
if not chunk: if not chunk:
break break
chunk_so_far += chunk chunk_so_far += chunk
if response.headers.get('Content-Encoding') == "gzip":
fileobj = BytesIO(chunk_so_far)
file = gzip.GzipFile(fileobj=fileobj)
return file.read()
return chunk_so_far return chunk_so_far
def stream_to_file(self, url, file, progress = True, headers = None): def stream_to_file(self, url, file, progress = True, headers = None):

6
gibMacOS.command
View File

@ -212,6 +212,10 @@ class gibMacOS:
else: else:
# Add them all! # Add them all!
prodd["packages"] = plist_dict.get("Products",{}).get(prod,{}).get("Packages",[]) prodd["packages"] = plist_dict.get("Products",{}).get(prod,{}).get("Packages",[])
# Get size
prodd["size"] = 0
for i in prodd["packages"]: prodd["size"] += i["Size"]
prodd["size"] = self.d.get_size(prodd["size"])
# Attempt to get the build/version info from the dist # Attempt to get the build/version info from the dist
b,v,n = self.get_build_version(plist_dict.get("Products",{}).get(prod,{}).get("Distributions",{})) b,v,n = self.get_build_version(plist_dict.get("Products",{}).get(prod,{}).get("Distributions",{}))
prodd["title"] = smd.get("localization",{}).get("English",{}).get("title",n) prodd["title"] = smd.get("localization",{}).get("English",{}).get("title",n)
@ -404,7 +408,7 @@ class gibMacOS:
var1 = "{}. {} {}".format(num, p["title"], p["version"]) var1 = "{}. {} {}".format(num, p["title"], p["version"])
if p["build"].lower() != "unknown": if p["build"].lower() != "unknown":
var1 += " ({})".format(p["build"]) var1 += " ({})".format(p["build"])
var2 = " - {} - Added {}".format(p["product"], p["date"]) var2 = " - {} - Added {} - {}".format(p["product"], p["date"], p["size"])
if self.find_recovery and p["installer"]: if self.find_recovery and p["installer"]:
# Show that it's a full installer # Show that it's a full installer
var2 += " - FULL Install" var2 += " - FULL Install"