diff --git a/Controller/__pycache__/smtp_export.cpython-39.pyc b/Controller/__pycache__/smtp_export.cpython-39.pyc index f19aa58..76cf20f 100644 Binary files a/Controller/__pycache__/smtp_export.cpython-39.pyc and b/Controller/__pycache__/smtp_export.cpython-39.pyc differ diff --git a/Controller/__pycache__/system_info.cpython-39.pyc b/Controller/__pycache__/system_info.cpython-39.pyc index 3e5c032..f8bb9db 100644 Binary files a/Controller/__pycache__/system_info.cpython-39.pyc and b/Controller/__pycache__/system_info.cpython-39.pyc differ diff --git a/Controller/smtp_export.py b/Controller/smtp_export.py index d9f11c9..4a5ee54 100644 --- a/Controller/smtp_export.py +++ b/Controller/smtp_export.py @@ -1,6 +1,6 @@ import requests from datetime import datetime -from Controller import mysql_connect +import Controller.mysql_connect def smtp(ip,name,mailcow_token): diff --git a/Controller/system_info.py b/Controller/system_info.py index 0a783c4..9e499b1 100644 --- a/Controller/system_info.py +++ b/Controller/system_info.py @@ -1,7 +1,7 @@ -from Controller import mysql_connect import psutil import platform import math +import Controller.mysql_connect as mysql_connect cpu = platform.processor() @@ -26,5 +26,5 @@ def get_hdd_info(): # Informationen über die CPU def set_system_info(name,ipadress): - query = f"UPDATE {name} SET RAM={get_ram_info()}, Prozessor={get_cpu_sql()}, CPU='{platform.processor()}' WHERE `IP-Adresse`={ipadress}" - return mysql_connect.update_cpu(query,"Stines-GmbH",get_cpu_sql()) + query = f"UPDATE {name} SET RAM={get_ram_info()}, Prozessor={get_cpu_sql()[0]}, CPU='{platform.processor()}' WHERE `IP-Adresse`={ipadress}" + return mysql_connect.update_cpu(query,"Stines-GmbH",get_cpu_sql()) \ No newline at end of file diff --git a/build/main/Analysis-00.toc b/build/main/Analysis-00.toc index c8d693b..2e9d961 100644 --- a/build/main/Analysis-00.toc +++ b/build/main/Analysis-00.toc @@ -331,22 +331,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\ast.py', 'PYMODULE'), + ('stringprep', + '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'), - ('subprocess', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\subprocess.py', - 'PYMODULE'), - ('selectors', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\selectors.py', - 'PYMODULE'), - ('signal', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\signal.py', - 'PYMODULE'), ('getpass', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\getpass.py', @@ -391,9 +383,17 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\_py_abc.py', 'PYMODULE'), - ('stringprep', + ('subprocess', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\stringprep.py', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\subprocess.py', + 'PYMODULE'), + ('selectors', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\selectors.py', + 'PYMODULE'), + ('signal', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\signal.py', 'PYMODULE'), ('Controller.mysql_connect', 'C:\\Users\\Sebastian ' @@ -1516,14 +1516,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\socket.py', 'PYMODULE')], - [('python39.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python39.dll', - 'BINARY'), - ('VCRUNTIME140.dll', + [('VCRUNTIME140.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140.dll', 'BINARY'), + ('python39.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python39.dll', + 'BINARY'), ('pywin32_system32\\pywintypes39.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\pywin32_system32\\pywintypes39.dll', @@ -1548,14 +1548,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\unicodedata.pyd', 'EXTENSION'), - ('select.pyd', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', - 'EXTENSION'), ('_ssl.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', 'EXTENSION'), + ('select.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', + 'EXTENSION'), ('_queue.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_queue.pyd', @@ -1648,7 +1648,6 @@ 'C:\\Users\\Sebastian ' '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', @@ -1656,55 +1655,56 @@ ('libcrypto-3-x64.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', - 'BINARY')], + 'BINARY'), + ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.dll', 'BINARY')], [], [], [('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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', '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', - '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\\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\\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\\RECORD', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', - 'DATA'), ('nacl\\py.typed', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', 'DATA'), - ('certifi\\cacert.pem', + ('certifi\\py.typed', 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\py.typed', + '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\\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\\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', '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\\INSTALLER', + ('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\\INSTALLER', + '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\\METADATA', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\METADATA', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', 'DATA')], []) diff --git a/build/main/EXE-00.toc b/build/main/EXE-00.toc index c4ee172..1cf3eda 100644 --- a/build/main/EXE-00.toc +++ b/build/main/EXE-00.toc @@ -55,14 +55,14 @@ ('main', 'C:\\Users\\Sebastian Serfling\\PycharmProjects\\server-info\\main.py', 'PYSOURCE'), - ('python39.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python39.dll', - 'BINARY'), ('VCRUNTIME140.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140.dll', 'BINARY'), + ('python39.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python39.dll', + 'BINARY'), ('pywin32_system32\\pywintypes39.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\pywin32_system32\\pywintypes39.dll', @@ -87,14 +87,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\unicodedata.pyd', 'EXTENSION'), - ('select.pyd', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', - 'EXTENSION'), ('_ssl.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', 'EXTENSION'), + ('select.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', + 'EXTENSION'), ('_queue.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_queue.pyd', @@ -187,7 +187,6 @@ 'C:\\Users\\Sebastian ' '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', @@ -196,58 +195,59 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', 'BINARY'), + ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.dll', 'BINARY'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA'), + ('nacl\\py.typed', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', + '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\\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\\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\\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\\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\\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\\RECORD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', 'DATA'), - ('nacl\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', - '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\\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\\INSTALLER', + ('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\\INSTALLER', + '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\\METADATA', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\METADATA', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', 'DATA')], [], False, False, - 1691491843, + 1691492594, [('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 e0e4e94..c283ef8 100644 --- a/build/main/PKG-00.toc +++ b/build/main/PKG-00.toc @@ -47,14 +47,14 @@ ('main', 'C:\\Users\\Sebastian Serfling\\PycharmProjects\\server-info\\main.py', 'PYSOURCE'), - ('python39.dll', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python39.dll', - 'BINARY'), ('VCRUNTIME140.dll', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\VCRUNTIME140.dll', 'BINARY'), + ('python39.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\python39.dll', + 'BINARY'), ('pywin32_system32\\pywintypes39.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\pywin32_system32\\pywintypes39.dll', @@ -79,14 +79,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\unicodedata.pyd', 'EXTENSION'), - ('select.pyd', - 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', - 'EXTENSION'), ('_ssl.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', 'EXTENSION'), + ('select.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', + 'EXTENSION'), ('_queue.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_queue.pyd', @@ -179,7 +179,6 @@ 'C:\\Users\\Sebastian ' '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', @@ -188,53 +187,54 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', 'BINARY'), + ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.dll', 'BINARY'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.APACHE', 'DATA'), + ('nacl\\py.typed', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', + '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\\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\\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\\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\\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\\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\\RECORD', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\RECORD', 'DATA'), - ('nacl\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', - '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\\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\\INSTALLER', + ('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\\INSTALLER', + '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\\METADATA', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\METADATA', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', 'DATA')], False, False, diff --git a/build/main/PYZ-00.pyz b/build/main/PYZ-00.pyz index 88b9a8a..b97fc66 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 9c27910..89b3d35 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 f70b425..c43faf7 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 8290f14..1515c21 100644 --- a/build/main/warn-main.txt +++ b/build/main/warn-main.txt @@ -16,16 +16,16 @@ IMPORTANT: Do NOT post this list to the issue-tracker. Use it as a basis for missing module named org - imported by pickle (optional) missing module named 'org.python' - imported by copy (optional), xml.sax (delayed, conditional) -missing module named posix - imported by shutil (conditional), importlib._bootstrap_external (conditional), os (conditional, 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) -missing module named grp - imported by shutil (optional), tarfile (optional), subprocess (optional), pathlib (delayed, optional) -missing module named pwd - imported by shutil (optional), tarfile (optional), posixpath (delayed, conditional), subprocess (optional), pathlib (delayed, conditional, optional), netrc (delayed, conditional), getpass (delayed), psutil (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 pep517 - imported by importlib.metadata (delayed) missing module named _frozen_importlib_external - imported by importlib._bootstrap (delayed), importlib (optional), importlib.abc (optional) excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional) -missing module named _posixsubprocess - imported by subprocess (optional) missing module named _scproxy - imported by urllib.request (conditional) missing module named termios - imported by getpass (optional), psutil._compat (delayed, optional) +missing module named _posixsubprocess - imported by subprocess (optional) missing module named SocketServer - imported by sshtunnel (conditional) missing module named Queue - imported by mysql.connector.pooling (optional), sshtunnel (conditional) missing module named invoke - imported by paramiko.config (optional) diff --git a/dist/main.exe b/dist/main.exe index ff28926..d9e4764 100644 Binary files a/dist/main.exe and b/dist/main.exe differ diff --git a/main.py b/main.py index ce82e8c..70138c5 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,6 @@ import socket -from Controller import adcontroller_export, exchange_export, rds_export, smtp_export, zammad,system_info,mysql_connect +from Controller import adcontroller_export, exchange_export, rds_export, smtp_export, zammad, system_info +import Controller.mysql_connect as mysql_connect def get_local_ip(): try: