diff --git a/Controller/system_info.py b/Controller/system_info.py index b3a83d2..61aff93 100644 --- a/Controller/system_info.py +++ b/Controller/system_info.py @@ -31,7 +31,7 @@ def get_hdd_info(): # Informationen über die CPU def set_system_info(ipadress): print("set_system_info") - print(get_cpu_sql()[0]) + print(get_cpu_sql()) query = f"UPDATE `Kunden-Server` SET RAM={get_ram_info()}, Prozessor={get_cpu_sql()[0]}, CPU='{get_cpu_info()}' WHERE `IP-Adresse`='{ipadress}'" print(query) mysql_connect.update_cpu(query,"Stines-GmbH") diff --git a/build/main/Analysis-00.toc b/build/main/Analysis-00.toc index 928d9e3..3de8a01 100644 --- a/build/main/Analysis-00.toc +++ b/build/main/Analysis-00.toc @@ -1727,14 +1727,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\_sodium.pyd', 'EXTENSION'), - ('libssl-1_1.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libssl-1_1.dll', - 'BINARY'), ('libcrypto-1_1.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libcrypto-1_1.dll', 'BINARY'), + ('libssl-1_1.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libssl-1_1.dll', + 'BINARY'), ('libffi-7.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libffi-7.dll', @@ -1748,10 +1748,6 @@ 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python3.dll', 'BINARY'), ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.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', @@ -1759,6 +1755,10 @@ ('VCRUNTIME140_1.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140_1.dll', + 'BINARY'), + ('libcrypto-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', 'BINARY')], [], [], @@ -1766,45 +1766,25 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', 'DATA'), - ('cryptography-41.0.2.dist-info\\REQUESTED', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\REQUESTED', - '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\\INSTALLER', '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\\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\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', - '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\\LICENSE.APACHE', + ('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.APACHE', - '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', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', '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', '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', + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', 'DATA'), ('nacl\\py.typed', 'C:\\Users\\Sebastian ' @@ -1813,5 +1793,25 @@ ('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', + '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'), + ('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'), + ('cryptography-41.0.2.dist-info\\REQUESTED', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\REQUESTED', + 'DATA'), + ('cryptography-41.0.2.dist-info\\LICENSE.APACHE', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA')], []) diff --git a/build/main/EXE-00.toc b/build/main/EXE-00.toc index 7d24b58..a869908 100644 --- a/build/main/EXE-00.toc +++ b/build/main/EXE-00.toc @@ -159,14 +159,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\_sodium.pyd', 'EXTENSION'), - ('libssl-1_1.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libssl-1_1.dll', - 'BINARY'), ('libcrypto-1_1.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libcrypto-1_1.dll', 'BINARY'), + ('libssl-1_1.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libssl-1_1.dll', + 'BINARY'), ('libffi-7.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libffi-7.dll', @@ -180,10 +180,6 @@ 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python3.dll', 'BINARY'), ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.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', @@ -192,49 +188,33 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140_1.dll', 'BINARY'), + ('libcrypto-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', + 'BINARY'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', 'DATA'), - ('cryptography-41.0.2.dist-info\\REQUESTED', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\REQUESTED', - '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\\INSTALLER', '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\\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\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', - '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\\LICENSE.APACHE', + ('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.APACHE', - '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', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', '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', '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', + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', 'DATA'), ('nacl\\py.typed', 'C:\\Users\\Sebastian ' @@ -243,11 +223,31 @@ ('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', + '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'), + ('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'), + ('cryptography-41.0.2.dist-info\\REQUESTED', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\REQUESTED', + 'DATA'), + ('cryptography-41.0.2.dist-info\\LICENSE.APACHE', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA')], [], False, False, - 1691747662, + 1691747721, [('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 87acc61..bf1e949 100644 --- a/build/main/PKG-00.toc +++ b/build/main/PKG-00.toc @@ -151,14 +151,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\_sodium.pyd', 'EXTENSION'), - ('libssl-1_1.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libssl-1_1.dll', - 'BINARY'), ('libcrypto-1_1.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libcrypto-1_1.dll', 'BINARY'), + ('libssl-1_1.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libssl-1_1.dll', + 'BINARY'), ('libffi-7.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\libffi-7.dll', @@ -172,10 +172,6 @@ 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python3.dll', 'BINARY'), ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.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', @@ -184,49 +180,33 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140_1.dll', 'BINARY'), + ('libcrypto-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', + 'BINARY'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', 'DATA'), - ('cryptography-41.0.2.dist-info\\REQUESTED', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\REQUESTED', - '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\\INSTALLER', '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\\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\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', - '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\\LICENSE.APACHE', + ('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.APACHE', - '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', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', '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', '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', + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', 'DATA'), ('nacl\\py.typed', 'C:\\Users\\Sebastian ' @@ -235,6 +215,26 @@ ('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', + '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'), + ('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'), + ('cryptography-41.0.2.dist-info\\REQUESTED', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\REQUESTED', + 'DATA'), + ('cryptography-41.0.2.dist-info\\LICENSE.APACHE', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA')], False, False, diff --git a/build/main/PYZ-00.pyz b/build/main/PYZ-00.pyz index c0021c7..21b663e 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 e5dac33..28e0380 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 7ab3e78..f1b5a5d 100644 Binary files a/build/main/main.pkg and b/build/main/main.pkg differ diff --git a/dist/main.exe b/dist/main.exe index 448d1bb..5140f37 100644 Binary files a/dist/main.exe and b/dist/main.exe differ