diff --git a/Controller/mysql_connect.py b/Controller/mysql_connect.py index 412f590..68582d7 100644 --- a/Controller/mysql_connect.py +++ b/Controller/mysql_connect.py @@ -30,26 +30,29 @@ def database(query,name,user): ) mydb.connect() cursor = mydb.cursor() - if user: - if "SELECT" in query: - cursor.execute(query,user) + if "SELECT" in query: + if user: + cursor.execute(query, user) return cursor.fetchone() else: - cursor.execute(query,user) - mydb.commit() - else: - cursor.execute(query) - if "SELECT" in query: - return cursor.fetchall() + cursor.execute(query, user) + return cursor.fetchall() if "SHOW" in query: + cursor.execute(query ) return cursor.fetchall() + if "INSERT" in query: + cursor.execute(query) + mydb.commit() + if "UPDATE" in query: + cursor.execute(query) + mydb.commit() mydb.close() server.stop() def get_ip(query): print("GetIP") user = "" name = "" - return database(query, name,user) + return database(query, name, user) def get_database(): name = "" user = "" @@ -64,7 +67,11 @@ def create_database(query,name): except Exception as e: print("Ein Fehler ist aufgetreten:", str(e)) def add_user(query,name,user): - return database(query,name,user) + try: + database(query, name, user) + return ("User Added") + except Exception as e: + print("Ein Fehler ist aufgetreten:", str(e)) def get_user(query,name,user): return database(query,name,user) diff --git a/Controller/smtp_export.py b/Controller/smtp_export.py index 4a5ee54..d9f11c9 100644 --- a/Controller/smtp_export.py +++ b/Controller/smtp_export.py @@ -1,6 +1,6 @@ import requests from datetime import datetime -import Controller.mysql_connect +from Controller import mysql_connect def smtp(ip,name,mailcow_token): diff --git a/Controller/system_info.py b/Controller/system_info.py index 5db47dc..7b151c9 100644 --- a/Controller/system_info.py +++ b/Controller/system_info.py @@ -4,6 +4,9 @@ import math import cpuinfo from Controller import mysql_connect +def get_cpu_info(): + return cpuinfo.get_cpu_info()['brand_raw'] + def get_cpu_sql(): 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']) @@ -25,5 +28,5 @@ def get_hdd_info(): # Informationen über die CPU def set_system_info(name,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}'" + query = f"UPDATE `Kunden-Server` SET RAM={get_ram_info()}, Prozessor={get_cpu_sql()[0]}, CPU='{get_cpu_info()}' WHERE `IP-Adresse`='{ipadress}'" return mysql_connect.update_cpu(query,"Stines-GmbH",get_cpu_sql()[0]) \ No newline at end of file diff --git a/build/main/Analysis-00.toc b/build/main/Analysis-00.toc index ab5d1d3..929e0c2 100644 --- a/build/main/Analysis-00.toc +++ b/build/main/Analysis-00.toc @@ -519,10 +519,6 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\stringprep.py', 'PYMODULE'), - ('tracemalloc', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\tracemalloc.py', - 'PYMODULE'), ('getpass', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\getpass.py', @@ -555,6 +551,10 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\_py_abc.py', 'PYMODULE'), + ('tracemalloc', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\tracemalloc.py', + 'PYMODULE'), ('subprocess', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\subprocess.py', @@ -1777,13 +1777,13 @@ 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libmysql.dll', 'BINARY'), ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.dll', 'BINARY'), - ('libssl-3-x64.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', - 'BINARY'), ('libcrypto-3-x64.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', + 'BINARY'), + ('libssl-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', 'BINARY')], [], [], @@ -1791,18 +1791,6 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', 'DATA'), - ('certifi\\cacert.pem', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', - 'DATA'), - ('nacl\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', - 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', - 'DATA'), ('cryptography-41.0.2.dist-info\\RECORD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', @@ -1811,6 +1799,22 @@ 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA'), + ('cryptography-41.0.2.dist-info\\LICENSE', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', + 'DATA'), + ('certifi\\py.typed', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', + 'DATA'), + ('cryptography-41.0.2.dist-info\\top_level.txt', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', + 'DATA'), ('cryptography-41.0.2.dist-info\\METADATA', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\METADATA', @@ -1819,20 +1823,16 @@ 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', 'DATA'), - ('cryptography-41.0.2.dist-info\\top_level.txt', + ('cryptography-41.0.2.dist-info\\WHEEL', 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', 'DATA'), - ('certifi\\py.typed', + ('nacl\\py.typed', 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', 'DATA'), ('cryptography-41.0.2.dist-info\\LICENSE.BSD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.BSD', - 'DATA'), - ('cryptography-41.0.2.dist-info\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', 'DATA')], []) diff --git a/build/main/EXE-00.toc b/build/main/EXE-00.toc index 83e3660..8bc390a 100644 --- a/build/main/EXE-00.toc +++ b/build/main/EXE-00.toc @@ -200,30 +200,18 @@ 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libmysql.dll', 'BINARY'), ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.dll', 'BINARY'), - ('libssl-3-x64.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', - 'BINARY'), ('libcrypto-3-x64.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', 'BINARY'), + ('libssl-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', + 'BINARY'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', 'DATA'), - ('certifi\\cacert.pem', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', - 'DATA'), - ('nacl\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', - 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', - 'DATA'), ('cryptography-41.0.2.dist-info\\RECORD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', @@ -232,6 +220,22 @@ 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA'), + ('cryptography-41.0.2.dist-info\\LICENSE', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', + 'DATA'), + ('certifi\\py.typed', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', + 'DATA'), + ('cryptography-41.0.2.dist-info\\top_level.txt', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', + 'DATA'), ('cryptography-41.0.2.dist-info\\METADATA', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\METADATA', @@ -240,26 +244,22 @@ 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', 'DATA'), - ('cryptography-41.0.2.dist-info\\top_level.txt', + ('cryptography-41.0.2.dist-info\\WHEEL', 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', 'DATA'), - ('certifi\\py.typed', + ('nacl\\py.typed', 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', 'DATA'), ('cryptography-41.0.2.dist-info\\LICENSE.BSD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.BSD', - 'DATA'), - ('cryptography-41.0.2.dist-info\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', 'DATA')], [], False, False, - 1691660217, + 1691667777, [('run.exe', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\PyInstaller\\bootloader\\Windows-64bit-intel\\run.exe', diff --git a/build/main/PKG-00.toc b/build/main/PKG-00.toc index 0e17cb1..e5f03c6 100644 --- a/build/main/PKG-00.toc +++ b/build/main/PKG-00.toc @@ -192,30 +192,18 @@ 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libmysql.dll', 'BINARY'), ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.dll', 'BINARY'), - ('libssl-3-x64.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', - 'BINARY'), ('libcrypto-3-x64.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', 'BINARY'), + ('libssl-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', + 'BINARY'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', 'DATA'), - ('certifi\\cacert.pem', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', - 'DATA'), - ('nacl\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', - 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', - 'DATA'), ('cryptography-41.0.2.dist-info\\RECORD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', @@ -224,6 +212,22 @@ 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA'), + ('cryptography-41.0.2.dist-info\\LICENSE', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', + 'DATA'), + ('certifi\\py.typed', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', + 'DATA'), + ('cryptography-41.0.2.dist-info\\top_level.txt', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', + 'DATA'), ('cryptography-41.0.2.dist-info\\METADATA', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\METADATA', @@ -232,21 +236,17 @@ 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', 'DATA'), - ('cryptography-41.0.2.dist-info\\top_level.txt', + ('cryptography-41.0.2.dist-info\\WHEEL', 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', 'DATA'), - ('certifi\\py.typed', + ('nacl\\py.typed', 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', 'DATA'), ('cryptography-41.0.2.dist-info\\LICENSE.BSD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.BSD', - 'DATA'), - ('cryptography-41.0.2.dist-info\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', 'DATA')], False, False, diff --git a/build/main/PYZ-00.pyz b/build/main/PYZ-00.pyz index 228975e..6c0e165 100644 Binary files a/build/main/PYZ-00.pyz and b/build/main/PYZ-00.pyz differ diff --git a/build/main/base_library.zip b/build/main/base_library.zip index 799b2c4..e15cea4 100644 Binary files a/build/main/base_library.zip and b/build/main/base_library.zip differ diff --git a/build/main/main.pkg b/build/main/main.pkg index ee6093b..3f4d88a 100644 Binary files a/build/main/main.pkg and b/build/main/main.pkg differ diff --git a/build/main/warn-main.txt b/build/main/warn-main.txt index 7c4af36..9593652 100644 --- a/build/main/warn-main.txt +++ b/build/main/warn-main.txt @@ -16,15 +16,15 @@ IMPORTANT: Do NOT post this list to the issue-tracker. Use it as a basis for missing module named pyimod02_importers - imported by C:\Users\Sebastian Serfling\PycharmProjects\server-info\venv\Lib\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgutil.py (delayed) missing module named pep517 - imported by importlib.metadata (delayed) -missing module named 'org.python' - imported by copy (optional), xml.sax (delayed, conditional) +missing module named org - imported by copy (optional) missing module named grp - imported by shutil (optional), tarfile (optional), pathlib (delayed, optional), subprocess (optional) missing module named pwd - imported by posixpath (delayed, conditional), shutil (optional), tarfile (optional), pathlib (delayed, conditional, optional), subprocess (optional), netrc (delayed, conditional), getpass (delayed), psutil (optional) missing module named posix - imported by os (conditional, optional), shutil (conditional), importlib._bootstrap_external (conditional) missing module named resource - imported by posix (top-level), psutil._pslinux (optional) excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional), zipimport (top-level) missing module named _frozen_importlib_external - imported by importlib._bootstrap (delayed), importlib (optional), importlib.abc (optional), zipimport (top-level) +missing module named 'org.python' - imported by pickle (optional), xml.sax (delayed, conditional) missing module named 'java.lang' - imported by platform (delayed, optional), xml.sax._exceptions (conditional) -missing module named org - imported by pickle (optional) missing module named multiprocessing.BufferTooShort - imported by multiprocessing (top-level), multiprocessing.connection (top-level) missing module named multiprocessing.AuthenticationError - imported by multiprocessing (top-level), multiprocessing.connection (top-level) missing module named _posixshmem - imported by multiprocessing.resource_tracker (conditional), multiprocessing.shared_memory (conditional) diff --git a/build/main/xref-main.html b/build/main/xref-main.html index 04004fe..b815913 100644 --- a/build/main/xref-main.html +++ b/build/main/xref-main.html @@ -306,7 +306,7 @@ imported by: 'org.python' MissingModule
@@ -2635,8 +2635,8 @@ imported by: copy SourceModule