Fixed cpu model name exception for certain xeon cpus

pull/122/head
aristocratos 2020-09-14 17:00:36 +02:00
parent d3f8a2f11d
commit f00e840657
1 changed files with 11 additions and 8 deletions

View File

@ -4215,14 +4215,17 @@ def get_cpu_name() -> str:
else: else:
name = cmd_out name = cmd_out
nlist = name.split(" ") nlist = name.split(" ")
if "Xeon" in name and "CPU" in name: try:
name = nlist[nlist.index("CPU")+1] if "Xeon" in name and "CPU" in name:
elif "Ryzen" in name: name = nlist[nlist.index("CPU")+(-1 if name.endswith("CPU") else 1)]
name = " ".join(nlist[nlist.index("Ryzen"):nlist.index("Ryzen")+3]) elif "Ryzen" in name:
elif "Duo" in name and "@" in name: name = " ".join(nlist[nlist.index("Ryzen"):nlist.index("Ryzen")+3])
name = " ".join(nlist[:nlist.index("@")]) elif "Duo" in name and "@" in name:
elif "CPU" in name and not nlist[0] == "CPU": name = " ".join(nlist[:nlist.index("@")])
name = nlist[nlist.index("CPU")-1] elif "CPU" in name and not nlist[0] == "CPU":
name = nlist[nlist.index("CPU")-1]
except:
pass
name = " ".join(name.split()) name = " ".join(name.split())