Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authoradvaithm <advaith.madhukar@gmail.com>2021-04-07 07:29:49 +0530
committeradvaithm <advaith.madhukar@gmail.com>2021-04-07 07:29:49 +0530
commit5c83682efdee2c74de0f709fb8229e8257854912 (patch)
tree76e00a3ef95a89b3e64c370499f0f71fc9205d76 /archinstall/lib
parent39e354f3952e0e0fd1a0c5505640b697eea99c21 (diff)
added return value for functions in hardware.py plus cpuVendor function
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/hardware.py25
1 files changed, 16 insertions, 9 deletions
diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index 10f3970f..3422a793 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -1,19 +1,19 @@
-import os, subprocess
+import os, subprocess, json
from .general import sys_command
from .networking import list_interfaces, enrichIfaceTypes
-
-def hasWifi():
+from typing import Optional
+def hasWifi()->bool:
return 'WIRELESS' in enrichIfaceTypes(list_interfaces().values()).values()
-def hasAMDCPU():
+def hasAMDCPU()->bool:
if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode():
return True
return False
-def hasUEFI():
+def hasUEFI()->bool:
return os.path.isdir('/sys/firmware/efi')
-def graphicsDevices():
+def graphicsDevices()->dict:
cards = {}
for line in sys_command(f"lspci"):
if b' VGA ' in line:
@@ -21,13 +21,20 @@ def graphicsDevices():
cards[identifier.strip().lower().decode('UTF-8')] = line
return cards
-def hasNvidiaGraphics():
+def hasNvidiaGraphics()->bool:
return any('nvidia' in x for x in graphicsDevices())
-def hasAmdGraphics():
+def hasAmdGraphics()->bool:
return any('amd' in x for x in graphicsDevices())
-def hasIntelGraphics():
+def hasIntelGraphics()->bool:
return any('intel' in x for x in graphicsDevices())
+
+def cpuVendor()-> Optional[str]:
+ cpu_info = json.loads(subprocess.check_output("lscpu -J", shell=True).decode('utf-8'))['lscpu']
+ for info in cpu_info:
+ if info.get('field',None):
+ if info.get('field',None) == "Vendor ID:":
+ return info.get('data',None)
# TODO: Add more identifiers