diff --git a/Controller/system_info.py b/Controller/system_info.py index 61aff93..e07363a 100644 --- a/Controller/system_info.py +++ b/Controller/system_info.py @@ -31,12 +31,12 @@ def get_hdd_info(): # Informationen über die CPU def set_system_info(ipadress): print("set_system_info") - print(get_cpu_sql()) + print(get_cpu_sql()[0]) 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") return print("Fin") -# ssh_tunnel.server_start() -# set_system_info("172.19.1.5") -# ssh_tunnel.server_stop() \ No newline at end of file +ssh_tunnel.server_start() +set_system_info("172.19.1.5") +ssh_tunnel.server_stop() \ No newline at end of file diff --git a/build/main/Analysis-00.toc b/build/main/Analysis-00.toc index 3de8a01..402651c 100644 --- a/build/main/Analysis-00.toc +++ b/build/main/Analysis-00.toc @@ -511,6 +511,18 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\multiprocessing\\__init__.py', 'PYMODULE'), + ('_py_abc', + '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'), + ('stringprep', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\stringprep.py', + 'PYMODULE'), ('getpass', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\getpass.py', @@ -539,18 +551,6 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\http\\cookiejar.py', 'PYMODULE'), - ('tracemalloc', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\tracemalloc.py', - 'PYMODULE'), - ('stringprep', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\stringprep.py', - 'PYMODULE'), - ('_py_abc', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\_py_abc.py', - 'PYMODULE'), ('subprocess', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\subprocess.py', @@ -1747,18 +1747,18 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python3.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'), - ('VCRUNTIME140_1.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140_1.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'), + ('VCRUNTIME140_1.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140_1.dll', 'BINARY')], [], [], @@ -1766,21 +1766,37 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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'), ('certifi\\py.typed', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', '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.APACHE', + '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'), - ('cryptography-41.0.2.dist-info\\METADATA', + ('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\\METADATA', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + '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\\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\\INSTALLER', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', 'DATA'), ('certifi\\cacert.pem', 'C:\\Users\\Sebastian ' @@ -1790,28 +1806,12 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', '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', - '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', + ('cryptography-41.0.2.dist-info\\RECORD', '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', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', 'DATA')], []) diff --git a/build/main/EXE-00.toc b/build/main/EXE-00.toc index a869908..d0ff796 100644 --- a/build/main/EXE-00.toc +++ b/build/main/EXE-00.toc @@ -179,38 +179,54 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python3.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'), + ('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'), ('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'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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'), ('certifi\\py.typed', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', '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.APACHE', + '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'), - ('cryptography-41.0.2.dist-info\\METADATA', + ('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\\METADATA', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + '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\\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\\INSTALLER', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', 'DATA'), ('certifi\\cacert.pem', 'C:\\Users\\Sebastian ' @@ -220,34 +236,18 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', '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', - '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', + ('cryptography-41.0.2.dist-info\\RECORD', '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', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', 'DATA')], [], False, False, - 1691747721, + 1691747907, [('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 bf1e949..43a5758 100644 --- a/build/main/PKG-00.toc +++ b/build/main/PKG-00.toc @@ -171,38 +171,54 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python3.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'), + ('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'), ('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'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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'), ('certifi\\py.typed', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', '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.APACHE', + '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'), - ('cryptography-41.0.2.dist-info\\METADATA', + ('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\\METADATA', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + '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\\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\\INSTALLER', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', 'DATA'), ('certifi\\cacert.pem', 'C:\\Users\\Sebastian ' @@ -212,29 +228,13 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', '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', - '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', + ('cryptography-41.0.2.dist-info\\RECORD', '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', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', 'DATA')], False, False, diff --git a/build/main/PYZ-00.pyz b/build/main/PYZ-00.pyz index 21b663e..ac8139b 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 28e0380..431c1d3 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 f1b5a5d..aa0afd3 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 5140f37..038432f 100644 Binary files a/dist/main.exe and b/dist/main.exe differ