Refactor cpu_model() to use cpuinfo()

2021-09-06 16:12:53 +02:00 · 2021-09-06 16:12:53 +02:00 · 8841e209ee
parent 086dcc3325
commit 8841e209ee
1 changed files with 3 additions and 6 deletions
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@ -118,13 +118,10 @@ def cpu_vendor() -> Optional[str]:


 def cpu_model() -> Optional[str]:
-	cpu_info_raw = SysCommand("lscpu -J")
-	cpu_info = json.loads(b"".join(cpu_info_raw).decode('UTF-8'))['lscpu']
+	for cpu in cpuinfo():
+		return cpu.get("model name")

-	for info in cpu_info:
-		if info.get('field', None) == "Model name:":
-			return info.get('data', None)
-	return
+	return None


 def sys_vendor() -> Optional[str]: