mirror/gibMacOS
1
0
Fork 0
mirror of https://github.com/corpnewt/gibMacOS.git synced 2024-09-20 09:30:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get name from 10.16 - credit to dhinakg

Browse source 
https://github.com/dhinakg
This commit is contained in:
CorpNewt 2020-06-22 15:08:36 -05:00 committed by GitHub
parent 25753053f9
commit 7a17c3fc11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gibMacOS.command
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
from Scripts import * from Scripts import *
import os, datetime, shutil, time, sys, argparse import os, datetime, shutil, time, sys, argparse, re
class gibMacOS: class gibMacOS:
def __init__(self): def __init__(self):
@ -150,7 +150,7 @@ class gibMacOS:
return mac_prods return mac_prods
def get_build_version(self, dist_dict): def get_build_version(self, dist_dict):
build = version = "Unknown" build = version = name = "Unknown"
try: try:
dist_url = dist_dict.get("English","") if dist_dict.get("English",None) else dist_dict.get("en","") dist_url = dist_dict.get("English","") if dist_dict.get("English",None) else dist_dict.get("en","")
dist_file = self.d.get_bytes(dist_url, False).decode("utf-8") dist_file = self.d.get_bytes(dist_url, False).decode("utf-8")
@ -167,7 +167,11 @@ class gibMacOS:
version = dist_file.split("<key>{}</key>".format(vers_search))[1].split("<string>")[1].split("</string>")[0] version = dist_file.split("<key>{}</key>".format(vers_search))[1].split("<string>")[1].split("</string>")[0]
except: except:
pass pass
return (build,version) try:
name = re.search(r"<title>(.+?)</title>",dist_file).group(1)
except:
pass
return (build,version,name)
def get_dict_for_prods(self, prods, plist_dict = None): def get_dict_for_prods(self, prods, plist_dict = None):
if plist_dict==self.catalog_data==None: if plist_dict==self.catalog_data==None:
@ -209,7 +213,8 @@ class gibMacOS:
# 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",[])
# Attempt to get the build/version info from the dist # Attempt to get the build/version info from the dist
b,v = 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["build"] = b prodd["build"] = b
if not v.lower() == "unknown": if not v.lower() == "unknown":
prodd["version"] = v prodd["version"] = v