From fd3f6697a44f3f49c9b31ff50810c48cf90c16c4 Mon Sep 17 00:00:00 2001 From: Sebastian Serfling Date: Tue, 8 Aug 2023 13:36:17 +0200 Subject: [PATCH] 123 --- Controller/system_info.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Controller/system_info.py b/Controller/system_info.py index 50ec9ba..ddd6468 100644 --- a/Controller/system_info.py +++ b/Controller/system_info.py @@ -1,11 +1,12 @@ import psutil import platform import math +import cpuinfo from Controller import mysql_connect def get_cpu_sql(): - query = f"SELECT `Prozessor-Anzahl` FROM `CPU-Liste` WHERE `CPU-Name`='{platform.processor()}'" - return mysql_connect.get_cpu(query,"Stines-GmbH",platform.processor()) + query = f"SELECT `Prozessor-Anzahl` FROM `CPU-Liste` WHERE `CPU-Name`='{cpuinfo.get_cpu_info()['brand_raw']}'" + return mysql_connect.get_cpu(query,"Stines-GmbH",cpuinfo.get_cpu_info()['brand_raw']) def get_ram_info(): ram_info = psutil.virtual_memory() @@ -24,7 +25,6 @@ def get_hdd_info(): # Informationen über die CPU def set_system_info(name,ipadress): - print(platform.processor()) - query = f"UPDATE `Kunden-Server` SET RAM={get_ram_info()}, Prozessor={get_cpu_sql()[0]}, CPU='{platform.processor()}' WHERE `IP-Adresse`='{ipadress}'" + query = f"UPDATE `Kunden-Server` SET RAM={get_ram_info()}, Prozessor={get_cpu_sql()[0]}, CPU='{cpuinfo.get_cpu_info()['brand_raw']}' WHERE `IP-Adresse`='{ipadress}'" print(query) return mysql_connect.update_cpu(query,"Stines-GmbH",get_cpu_sql()[0]) \ No newline at end of file