diff --git a/Controller/__pycache__/__init__.cpython-39.pyc b/Controller/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..ef62875 Binary files /dev/null and b/Controller/__pycache__/__init__.cpython-39.pyc differ diff --git a/Controller/__pycache__/adcontroller_export.cpython-39.pyc b/Controller/__pycache__/adcontroller_export.cpython-39.pyc new file mode 100644 index 0000000..c556ff3 Binary files /dev/null and b/Controller/__pycache__/adcontroller_export.cpython-39.pyc differ diff --git a/Controller/__pycache__/exchange_export.cpython-39.pyc b/Controller/__pycache__/exchange_export.cpython-39.pyc new file mode 100644 index 0000000..f70706f Binary files /dev/null and b/Controller/__pycache__/exchange_export.cpython-39.pyc differ diff --git a/Controller/__pycache__/mysql_connect.cpython-39.pyc b/Controller/__pycache__/mysql_connect.cpython-39.pyc new file mode 100644 index 0000000..b6e813d Binary files /dev/null and b/Controller/__pycache__/mysql_connect.cpython-39.pyc differ diff --git a/Controller/__pycache__/rds_export.cpython-39.pyc b/Controller/__pycache__/rds_export.cpython-39.pyc new file mode 100644 index 0000000..ea96ba8 Binary files /dev/null and b/Controller/__pycache__/rds_export.cpython-39.pyc differ diff --git a/Controller/__pycache__/smtp_export.cpython-39.pyc b/Controller/__pycache__/smtp_export.cpython-39.pyc new file mode 100644 index 0000000..f19aa58 Binary files /dev/null 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 new file mode 100644 index 0000000..3e5c032 Binary files /dev/null and b/Controller/__pycache__/system_info.cpython-39.pyc differ diff --git a/Controller/__pycache__/zammad.cpython-39.pyc b/Controller/__pycache__/zammad.cpython-39.pyc new file mode 100644 index 0000000..dac36a5 Binary files /dev/null and b/Controller/__pycache__/zammad.cpython-39.pyc differ diff --git a/Controller/mysql_connect.py b/Controller/mysql_connect.py index 5c2a515..412f590 100644 --- a/Controller/mysql_connect.py +++ b/Controller/mysql_connect.py @@ -68,3 +68,9 @@ def add_user(query,name,user): def get_user(query,name,user): return database(query,name,user) + +def get_cpu(query,name,cpu): + return database(query,name,cpu) + +def update_cpu(query,name,cpu): + return database(query,name,cpu) \ No newline at end of file diff --git a/Controller/system_info.py b/Controller/system_info.py new file mode 100644 index 0000000..e1fcf15 --- /dev/null +++ b/Controller/system_info.py @@ -0,0 +1,30 @@ +from Controller import mysql_connect +import psutil +import platform +import math + +ipadress = "'172.18.1.6'" + +def get_cpu_sql(cpu): + query = f"SELECT `Prozessor-Anzahl` FROM `CPU-Liste` WHERE `CPU-Name`='{cpu}'" + return mysql_connect.get_cpu(query,"Stines-GmbH",cpu) + +def get_ram_info(): + ram_info = psutil.virtual_memory() + total_ram = ram_info.total / (1024 ** 3) # In Gigabytes + return math.ceil(total_ram) + +def get_hdd_info(): + total_disk_size = 0 + disk_partitions = psutil.disk_partitions() + for partition in disk_partitions: + # Wenn du das Laufwerk C: ignorieren möchtest + if partition.device != 'C:\\': + partition_info = psutil.disk_usage(partition.mountpoint) + total_disk_size += partition_info.total / (1024 ** 3) + return math.ceil(total_disk_size) + +# Informationen über die CPU +def set_system_info(name,cpu,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()) diff --git a/__pycache__/adcontroller_export.cpython-39.pyc b/__pycache__/adcontroller_export.cpython-39.pyc deleted file mode 100644 index f8f2d24..0000000 Binary files a/__pycache__/adcontroller_export.cpython-39.pyc and /dev/null differ diff --git a/__pycache__/exchange_export.cpython-39.pyc b/__pycache__/exchange_export.cpython-39.pyc deleted file mode 100644 index 1413195..0000000 Binary files a/__pycache__/exchange_export.cpython-39.pyc and /dev/null differ diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc new file mode 100644 index 0000000..91c3208 Binary files /dev/null and b/__pycache__/main.cpython-39.pyc differ diff --git a/__pycache__/smtp_export.cpython-39.pyc b/__pycache__/smtp_export.cpython-39.pyc deleted file mode 100644 index 0265860..0000000 Binary files a/__pycache__/smtp_export.cpython-39.pyc and /dev/null differ diff --git a/build/Reports/localpycs/pyimod01_archive.pyc b/build/Reports/localpycs/pyimod01_archive.pyc new file mode 100644 index 0000000..150358b Binary files /dev/null and b/build/Reports/localpycs/pyimod01_archive.pyc differ diff --git a/build/Reports/localpycs/pyimod02_importers.pyc b/build/Reports/localpycs/pyimod02_importers.pyc new file mode 100644 index 0000000..e54e27e Binary files /dev/null and b/build/Reports/localpycs/pyimod02_importers.pyc differ diff --git a/build/Reports/localpycs/pyimod03_ctypes.pyc b/build/Reports/localpycs/pyimod03_ctypes.pyc new file mode 100644 index 0000000..1488763 Binary files /dev/null and b/build/Reports/localpycs/pyimod03_ctypes.pyc differ diff --git a/build/Reports/localpycs/pyimod04_pywin32.pyc b/build/Reports/localpycs/pyimod04_pywin32.pyc new file mode 100644 index 0000000..9657438 Binary files /dev/null and b/build/Reports/localpycs/pyimod04_pywin32.pyc differ diff --git a/build/Reports/localpycs/struct.pyc b/build/Reports/localpycs/struct.pyc new file mode 100644 index 0000000..1bc4ebd Binary files /dev/null and b/build/Reports/localpycs/struct.pyc differ diff --git a/build/Start/localpycs/pyimod01_archive.pyc b/build/Start/localpycs/pyimod01_archive.pyc new file mode 100644 index 0000000..150358b Binary files /dev/null and b/build/Start/localpycs/pyimod01_archive.pyc differ diff --git a/build/Start/localpycs/pyimod02_importers.pyc b/build/Start/localpycs/pyimod02_importers.pyc new file mode 100644 index 0000000..e54e27e Binary files /dev/null and b/build/Start/localpycs/pyimod02_importers.pyc differ diff --git a/build/Start/localpycs/pyimod03_ctypes.pyc b/build/Start/localpycs/pyimod03_ctypes.pyc new file mode 100644 index 0000000..1488763 Binary files /dev/null and b/build/Start/localpycs/pyimod03_ctypes.pyc differ diff --git a/build/Start/localpycs/pyimod04_pywin32.pyc b/build/Start/localpycs/pyimod04_pywin32.pyc new file mode 100644 index 0000000..9b7c77b Binary files /dev/null and b/build/Start/localpycs/pyimod04_pywin32.pyc differ diff --git a/build/Start/localpycs/struct.pyc b/build/Start/localpycs/struct.pyc new file mode 100644 index 0000000..1bc4ebd Binary files /dev/null and b/build/Start/localpycs/struct.pyc differ diff --git a/build/download/localpycs/pyimod01_archive.pyc b/build/download/localpycs/pyimod01_archive.pyc new file mode 100644 index 0000000..150358b Binary files /dev/null and b/build/download/localpycs/pyimod01_archive.pyc differ diff --git a/build/download/localpycs/pyimod02_importers.pyc b/build/download/localpycs/pyimod02_importers.pyc new file mode 100644 index 0000000..e54e27e Binary files /dev/null and b/build/download/localpycs/pyimod02_importers.pyc differ diff --git a/build/download/localpycs/pyimod03_ctypes.pyc b/build/download/localpycs/pyimod03_ctypes.pyc new file mode 100644 index 0000000..1488763 Binary files /dev/null and b/build/download/localpycs/pyimod03_ctypes.pyc differ diff --git a/build/download/localpycs/pyimod04_pywin32.pyc b/build/download/localpycs/pyimod04_pywin32.pyc new file mode 100644 index 0000000..9b7c77b Binary files /dev/null and b/build/download/localpycs/pyimod04_pywin32.pyc differ diff --git a/build/download/localpycs/struct.pyc b/build/download/localpycs/struct.pyc new file mode 100644 index 0000000..1bc4ebd Binary files /dev/null and b/build/download/localpycs/struct.pyc differ diff --git a/build/first_run/localpycs/pyimod01_archive.pyc b/build/first_run/localpycs/pyimod01_archive.pyc new file mode 100644 index 0000000..150358b Binary files /dev/null and b/build/first_run/localpycs/pyimod01_archive.pyc differ diff --git a/build/first_run/localpycs/pyimod02_importers.pyc b/build/first_run/localpycs/pyimod02_importers.pyc new file mode 100644 index 0000000..e54e27e Binary files /dev/null and b/build/first_run/localpycs/pyimod02_importers.pyc differ diff --git a/build/first_run/localpycs/pyimod03_ctypes.pyc b/build/first_run/localpycs/pyimod03_ctypes.pyc new file mode 100644 index 0000000..1488763 Binary files /dev/null and b/build/first_run/localpycs/pyimod03_ctypes.pyc differ diff --git a/build/first_run/localpycs/pyimod04_pywin32.pyc b/build/first_run/localpycs/pyimod04_pywin32.pyc new file mode 100644 index 0000000..9b7c77b Binary files /dev/null and b/build/first_run/localpycs/pyimod04_pywin32.pyc differ diff --git a/build/first_run/localpycs/struct.pyc b/build/first_run/localpycs/struct.pyc new file mode 100644 index 0000000..1bc4ebd Binary files /dev/null and b/build/first_run/localpycs/struct.pyc differ diff --git a/build/main/Analysis-00.toc b/build/main/Analysis-00.toc index 9a44aa6..d1ee8b8 100644 --- a/build/main/Analysis-00.toc +++ b/build/main/Analysis-00.toc @@ -331,6 +331,30 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\ast.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'), + ('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'), ('getpass', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\getpass.py', @@ -371,30 +395,6 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\http\\client.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'), - ('_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', - '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 ' 'Serfling\\PycharmProjects\\server-info\\Controller\\mysql_connect.py', @@ -1112,6 +1112,82 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\mysql\\connector\\locales\\eng\\__init__.py', 'PYMODULE'), + ('Controller.system_info', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\Controller\\system_info.py', + 'PYMODULE'), + ('psutil', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\__init__.py', + 'PYMODULE'), + ('psutil._psaix', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psaix.py', + 'PYMODULE'), + ('glob', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\glob.py', + 'PYMODULE'), + ('psutil._pssunos', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_pssunos.py', + 'PYMODULE'), + ('psutil._psbsd', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psbsd.py', + 'PYMODULE'), + ('xml.etree.ElementTree', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\ElementTree.py', + 'PYMODULE'), + ('xml.etree.cElementTree', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\cElementTree.py', + 'PYMODULE'), + ('xml.etree.ElementInclude', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\ElementInclude.py', + 'PYMODULE'), + ('xml.etree.ElementPath', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\ElementPath.py', + 'PYMODULE'), + ('xml.etree', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\__init__.py', + 'PYMODULE'), + ('psutil._psosx', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psosx.py', + 'PYMODULE'), + ('psutil._pswindows', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_pswindows.py', + 'PYMODULE'), + ('psutil._pslinux', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_pslinux.py', + 'PYMODULE'), + ('psutil._psposix', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psposix.py', + 'PYMODULE'), + ('psutil._compat', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_compat.py', + 'PYMODULE'), + ('psutil._common', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_common.py', + 'PYMODULE'), + ('curses', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\curses\\__init__.py', + 'PYMODULE'), + ('curses.has_key', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\curses\\has_key.py', + 'PYMODULE'), ('Controller.zammad', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\Controller\\zammad.py', @@ -1440,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', @@ -1468,17 +1544,17 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_bz2.pyd', 'EXTENSION'), - ('_ssl.pyd', + ('select.pyd', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', 'EXTENSION'), ('unicodedata.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\unicodedata.pyd', 'EXTENSION'), - ('select.pyd', + ('_ssl.pyd', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', 'EXTENSION'), ('_queue.pyd', 'C:\\Users\\Sebastian ' @@ -1524,6 +1600,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\_mysql_connector.cp39-win_amd64.pyd', 'EXTENSION'), + ('_elementtree.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_elementtree.pyd', + 'EXTENSION'), + ('psutil\\_psutil_windows.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psutil_windows.pyd', + 'EXTENSION'), ('psycopg2\\_psycopg.cp39-win_amd64.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psycopg2\\_psycopg.cp39-win_amd64.pyd', @@ -1579,33 +1663,21 @@ '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'), ('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'), - ('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', - '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\\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\\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', + ('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\\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\\RECORD', 'c:\\users\\sebastian ' @@ -1619,8 +1691,20 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', 'DATA'), - ('cryptography-41.0.2.dist-info\\INSTALLER', + ('cryptography-41.0.2.dist-info\\METADATA', '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\\METADATA', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', + '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', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', 'DATA')], []) diff --git a/build/main/EXE-00.toc b/build/main/EXE-00.toc index 633d0c9..e8782b1 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', @@ -83,17 +83,17 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_bz2.pyd', 'EXTENSION'), - ('_ssl.pyd', + ('select.pyd', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', 'EXTENSION'), ('unicodedata.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\unicodedata.pyd', 'EXTENSION'), - ('select.pyd', + ('_ssl.pyd', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', 'EXTENSION'), ('_queue.pyd', 'C:\\Users\\Sebastian ' @@ -139,6 +139,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\_mysql_connector.cp39-win_amd64.pyd', 'EXTENSION'), + ('_elementtree.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_elementtree.pyd', + 'EXTENSION'), + ('psutil\\_psutil_windows.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psutil_windows.pyd', + 'EXTENSION'), ('psycopg2\\_psycopg.cp39-win_amd64.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psycopg2\\_psycopg.cp39-win_amd64.pyd', @@ -192,33 +200,21 @@ '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'), ('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'), - ('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', - '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\\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\\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', + ('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\\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\\RECORD', 'c:\\users\\sebastian ' @@ -232,14 +228,26 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', 'DATA'), - ('cryptography-41.0.2.dist-info\\INSTALLER', + ('cryptography-41.0.2.dist-info\\METADATA', '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\\METADATA', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', + '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', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', 'DATA')], [], False, False, - 1691020652, + 1691491043, [('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 d8b375b..c50d129 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', @@ -75,17 +75,17 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_bz2.pyd', 'EXTENSION'), - ('_ssl.pyd', + ('select.pyd', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', 'EXTENSION'), ('unicodedata.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\unicodedata.pyd', 'EXTENSION'), - ('select.pyd', + ('_ssl.pyd', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\select.pyd', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_ssl.pyd', 'EXTENSION'), ('_queue.pyd', 'C:\\Users\\Sebastian ' @@ -131,6 +131,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\_mysql_connector.cp39-win_amd64.pyd', 'EXTENSION'), + ('_elementtree.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\DLLs\\_elementtree.pyd', + 'EXTENSION'), + ('psutil\\_psutil_windows.pyd', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psutil_windows.pyd', + 'EXTENSION'), ('psycopg2\\_psycopg.cp39-win_amd64.pyd', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psycopg2\\_psycopg.cp39-win_amd64.pyd', @@ -184,33 +192,21 @@ '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'), ('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'), - ('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', - '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\\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\\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', + ('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\\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\\RECORD', 'c:\\users\\sebastian ' @@ -224,9 +220,21 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', 'DATA'), - ('cryptography-41.0.2.dist-info\\INSTALLER', + ('cryptography-41.0.2.dist-info\\METADATA', '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\\METADATA', + 'DATA'), + ('certifi\\cacert.pem', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\cacert.pem', + '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', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', 'DATA')], False, False, diff --git a/build/main/PYZ-00.pyz b/build/main/PYZ-00.pyz index 8006380..96f39c6 100644 Binary files a/build/main/PYZ-00.pyz and b/build/main/PYZ-00.pyz differ diff --git a/build/main/PYZ-00.toc b/build/main/PYZ-00.toc index c34a8ab..2c4cb8b 100644 --- a/build/main/PYZ-00.toc +++ b/build/main/PYZ-00.toc @@ -24,6 +24,10 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\Controller\\smtp_export.py', 'PYMODULE'), + ('Controller.system_info', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\Controller\\system_info.py', + 'PYMODULE'), ('Controller.zammad', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\Controller\\zammad.py', @@ -380,6 +384,14 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\ctypes\\wintypes.py', 'PYMODULE'), + ('curses', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\curses\\__init__.py', + 'PYMODULE'), + ('curses.has_key', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\curses\\has_key.py', + 'PYMODULE'), ('dataclasses', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\dataclasses.py', @@ -496,6 +508,10 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\gettext.py', 'PYMODULE'), + ('glob', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\glob.py', + 'PYMODULE'), ('gzip', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\gzip.py', @@ -1036,6 +1052,46 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\pprint.py', 'PYMODULE'), + ('psutil', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\__init__.py', + 'PYMODULE'), + ('psutil._common', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_common.py', + 'PYMODULE'), + ('psutil._compat', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_compat.py', + 'PYMODULE'), + ('psutil._psaix', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psaix.py', + 'PYMODULE'), + ('psutil._psbsd', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psbsd.py', + 'PYMODULE'), + ('psutil._pslinux', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_pslinux.py', + 'PYMODULE'), + ('psutil._psosx', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psosx.py', + 'PYMODULE'), + ('psutil._psposix', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_psposix.py', + 'PYMODULE'), + ('psutil._pssunos', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_pssunos.py', + 'PYMODULE'), + ('psutil._pswindows', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psutil\\_pswindows.py', + 'PYMODULE'), ('psycopg2', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\psycopg2\\__init__.py', @@ -1357,6 +1413,26 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\__init__.py', 'PYMODULE'), + ('xml.etree', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\__init__.py', + 'PYMODULE'), + ('xml.etree.ElementInclude', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\ElementInclude.py', + 'PYMODULE'), + ('xml.etree.ElementPath', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\ElementPath.py', + 'PYMODULE'), + ('xml.etree.ElementTree', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\ElementTree.py', + 'PYMODULE'), + ('xml.etree.cElementTree', + 'C:\\Users\\Sebastian ' + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\etree\\cElementTree.py', + 'PYMODULE'), ('xml.parsers', 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\xml\\parsers\\__init__.py', diff --git a/build/main/base_library.zip b/build/main/base_library.zip index 7ec711a..4881b81 100644 Binary files a/build/main/base_library.zip and b/build/main/base_library.zip differ diff --git a/build/main/localpycs/pyimod04_pywin32.pyc b/build/main/localpycs/pyimod04_pywin32.pyc index 9b7c77b..9657438 100644 Binary files a/build/main/localpycs/pyimod04_pywin32.pyc and b/build/main/localpycs/pyimod04_pywin32.pyc differ diff --git a/build/main/main.pkg b/build/main/main.pkg index 5589c37..516b9ef 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 fcb7fdb..b956cea 100644 --- a/build/main/warn-main.txt +++ b/build/main/warn-main.txt @@ -14,23 +14,23 @@ Types if import: IMPORTANT: Do NOT post this list to the issue-tracker. Use it as a basis for tracking down the missing module yourself. Thanks! -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 resource - imported by posix (top-level) +missing module named 'org.python' - imported by pickle (optional), xml.sax (delayed, conditional) +missing module named org - imported by copy (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), 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) +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 _scproxy - imported by urllib.request (conditional) -missing module named termios - imported by getpass (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 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) missing module named cryptography.x509.UnsupportedExtension - imported by cryptography.x509 (optional), urllib3.contrib.pyopenssl (optional) -missing module named fcntl - imported by paramiko.agent (delayed) +missing module named fcntl - imported by paramiko.agent (delayed), psutil._compat (delayed, optional) missing module named 'pyasn1.codec' - imported by paramiko.ssh_gss (delayed) missing module named pyasn1 - imported by paramiko.ssh_gss (delayed) missing module named gssapi - imported by paramiko.ssh_gss (optional) @@ -42,8 +42,14 @@ missing module named httplib - imported by mysql.connector.fabric.connection (co missing module named urllib2 - imported by mysql.connector.fabric.connection (optional) missing module named xmlrpclib - imported by mysql.connector.fabric.connection (optional) missing module named ConfigParser - imported by mysql.connector.optionfiles (conditional) +missing module named psutil._psutil_aix - imported by psutil (top-level), psutil._psaix (top-level) +missing module named psutil._psutil_sunos - imported by psutil (top-level), psutil._pssunos (top-level) +missing module named psutil._psutil_bsd - imported by psutil (top-level), psutil._psbsd (top-level) +missing module named psutil._psutil_linux - imported by psutil (top-level), psutil._pslinux (top-level) +missing module named psutil._psutil_osx - imported by psutil (conditional), psutil._psposix (conditional), psutil._psosx (top-level) +missing module named dummy_threading - imported by requests.cookies (optional), psutil._compat (optional) +missing module named _curses - imported by curses (top-level), curses.has_key (top-level) missing module named simplejson - imported by requests.compat (conditional, optional) -missing module named dummy_threading - imported by requests.cookies (optional) missing module named typing_extensions - imported by urllib3.connection (conditional), urllib3.util.timeout (conditional), urllib3._base_connection (conditional), urllib3.util.request (conditional), urllib3._collections (conditional), urllib3.util.ssl_ (conditional), urllib3.util.ssltransport (conditional), urllib3.connectionpool (conditional), urllib3.response (conditional), urllib3.poolmanager (conditional) missing module named zstandard - imported by urllib3.response (optional), urllib3.util.request (optional) missing module named brotli - imported by urllib3.response (optional), urllib3.util.request (optional) diff --git a/build/main/xref-main.html b/build/main/xref-main.html index 26f56f1..dcea5ac 100644 --- a/build/main/xref-main.html +++ b/build/main/xref-main.html @@ -24,6 +24,7 @@ imports: • Controller.mysql_connect • Controller.rds_export • Controller.smtp_export + • Controller.system_info • Controller.zammad • _bootlocale • _collections_abc @@ -258,7 +259,7 @@ imported by: 'org.python' MissingModule
imported by: - copy + pickle • xml.sax
@@ -308,6 +309,7 @@ imports: • Controller.mysql_connect • Controller.rds_export • Controller.smtp_export + • Controller.system_info • Controller.zammad @@ -318,6 +320,7 @@ imported by: • Controller.mysql_connect • Controller.rds_export • Controller.smtp_export + • Controller.system_info • Controller.zammad • main.py @@ -386,6 +389,7 @@ imported by: • Controller.exchange_export • Controller.rds_export • Controller.smtp_export + • Controller.system_info • Controller.zammad • main.py @@ -433,6 +437,27 @@ imported by: +
+ + Controller.system_info +SourceModule
+imports: + Controller + • Controller.mysql_connect + • math + • platform + • psutil + +
+
+imported by: + Controller + • main.py + +
+ +
+
Controller.zammad @@ -545,6 +570,9 @@ imported by: • cryptography.x509.name • cryptography.x509.oid • mysql.connector.utils + • psutil + • psutil._common + • psutil._pslinux • urllib3 • urllib3._base_connection • urllib3._collections @@ -843,6 +871,23 @@ imported by:
+
+ + _curses +MissingModule
+imports: + curses + +
+
+imported by: + curses + • curses.has_key + +
+ +
+
_datetime (builtin module)
@@ -869,6 +914,25 @@ imported by:
+
+ + _elementtree C:\Users\Sebastian Serfling\AppData\Local\Programs\Python\Python39\DLLs\_elementtree.pyd
+imports: + pyexpat + • xml.etree.ElementInclude + • xml.etree.ElementPath + • xml.etree.ElementTree + • xml.etree.cElementTree + +
+
+imported by: + xml.etree.ElementTree + +
+ +
+
_frozen_importlib @@ -1605,6 +1669,7 @@ imported by: • nacl.encoding • paramiko.hostkeys • paramiko.pkey + • psutil._pslinux • requests.auth • ssl • urllib.request @@ -2321,6 +2386,15 @@ imported by: • paramiko.sftp_file • platform • pprint + • psutil + • psutil._common + • psutil._compat + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._pssunos + • psutil._pswindows • psycopg2.extras • queue • requests.compat @@ -2341,6 +2415,7 @@ imported by: • urllib.robotparser • urllib3._collections • urllib3.response + • xml.etree.ElementTree
@@ -2367,6 +2442,7 @@ imported by: • selectors • tracemalloc • typing + • xml.etree.ElementTree
@@ -2416,15 +2492,22 @@ imported by: • ast • cryptography.hazmat.backends.openssl.backend • getpass + • glob • importlib._common • importlib.metadata • importlib.resources • importlib.util + • psutil + • psutil._common + • psutil._compat + • psutil._psbsd + • psutil._pswindows • requests.utils • subprocess • typing • urllib.request • urllib3.response + • xml.etree.ElementTree • zipfile @@ -2452,8 +2535,8 @@ imported by: copy SourceModule
imports: - 'org.python' - • copyreg + copyreg + • org • types • weakref @@ -2470,6 +2553,7 @@ imported by: • requests.cookies • tarfile • weakref + • xml.etree.ElementInclude
@@ -4173,6 +4257,8 @@ imports: imported by: ctypes._endian • ctypes.wintypes + • psutil._common + • psutil._pslinux @@ -4212,6 +4298,46 @@ imported by: +
+ + curses +Package
+imports: + _curses + • curses + • curses.has_key + • os + • sys + +
+
+imported by: + _curses + • curses + • curses.has_key + • psutil._common + +
+ +
+ +
+ + curses.has_key +SourceModule
+imports: + _curses + • curses + +
+
+imported by: + curses + +
+ +
+
dataclasses @@ -4268,6 +4394,7 @@ imported by: • mysql.connector.fabric.caching • mysql.connector.fabric.connection • mysql.connector.protocol + • psutil • requests.models • requests.sessions • urllib3.connection @@ -4327,7 +4454,8 @@ imported by: dummy_threading MissingModule
imported by: - requests.cookies + psutil._compat + • requests.cookies
@@ -7332,6 +7460,10 @@ imported by: • http • inspect • main.py + • psutil._common + • psutil._pslinux + • psutil._psposix + • psutil._pswindows • py_compile • re • signal @@ -7358,6 +7490,13 @@ imported by: • paramiko.sftp_client • paramiko.sftp_server • pathlib + • psutil._common + • psutil._compat + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._pssunos + • psutil._pswindows • shutil • socket • ssl @@ -7376,6 +7515,7 @@ imported by: MissingModule
imported by: paramiko.agent + • psutil._compat
@@ -7395,7 +7535,8 @@ imports:
imported by: - main.py + glob + • main.py • paramiko.config • pathlib • shutil @@ -7487,6 +7628,15 @@ imported by: • pathlib • pickle • platform + • psutil + • psutil._common + • psutil._compat + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._pssunos + • psutil._pswindows • psycopg2.extras • re • tempfile @@ -7608,6 +7758,28 @@ imported by:
+
+ + glob +SourceModule
+imports: + contextlib + • fnmatch + • os + • re + • sys + +
+
+imported by: + psutil._psaix + • psutil._pslinux + • psutil._psposix + +
+ +
+
grp @@ -8258,6 +8430,7 @@ imported by: ast • dataclasses • paramiko.client + • psutil._common • pyi_rth_inspect.py
@@ -8334,6 +8507,7 @@ imported by: • urllib3.util.request • urllib3.util.ssltransport • uuid + • xml.etree.ElementTree • xml.sax • xml.sax.saxutils • xmlrpc.client @@ -8635,7 +8809,8 @@ imported by: math (builtin module)
imported by: - _pydecimal + Controller.system_info + • _pydecimal • cryptography.hazmat.primitives.asymmetric.rsa • datetime • fractions @@ -10060,7 +10235,7 @@ imported by: org MissingModule
imported by: - pickle + copy
@@ -10099,12 +10274,14 @@ imported by: • cryptography.hazmat.primitives.serialization.ssh • cryptography.x509.base • ctypes + • curses • email.utils • fnmatch • genericpath • getopt • getpass • gettext + • glob • gzip • http.cookiejar • importlib._common @@ -10146,6 +10323,16 @@ imported by: • pathlib • platform • posixpath + • psutil + • psutil._common + • psutil._compat + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._psposix + • psutil._pssunos + • psutil._pswindows • psycopg2.extras • py_compile • pyi_rth_inspect.py @@ -11557,14 +11744,14 @@ imported by: pickle SourceModule
imports: - _compat_pickle + 'org.python' + • _compat_pickle • _pickle • codecs • copyreg • functools • io • itertools - • org • pprint • re • struct @@ -11604,7 +11791,9 @@ imports:
imported by: - paramiko.win_pageant + Controller.system_info + • paramiko.win_pageant + • psutil._compat • uuid
@@ -11678,6 +11867,412 @@ imported by:
+
+ + psutil +Package
+imports: + __future__ + • collections + • contextlib + • datetime + • functools + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._psposix + • psutil._pssunos + • psutil._psutil_aix + • psutil._psutil_bsd + • psutil._psutil_linux + • psutil._psutil_osx + • psutil._psutil_sunos + • psutil._psutil_windows + • psutil._pswindows + • pwd + • signal + • socket + • subprocess + • sys + • threading + • time + +
+
+imported by: + Controller.system_info + • psutil + • psutil._common + • psutil._compat + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._psposix + • psutil._pssunos + • psutil._psutil_windows + • psutil._pswindows + +
+ +
+ +
+ + psutil._common +SourceModule
+imports: + __future__ + • collections + • contextlib + • ctypes + • curses + • enum + • errno + • functools + • inspect + • os + • psutil + • socket + • stat + • sys + • threading + • warnings + +
+
+imported by: + psutil + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._psposix + • psutil._pssunos + • psutil._pswindows + +
+ +
+ +
+ + psutil._compat +SourceModule
+imports: + collections + • contextlib + • dummy_threading + • errno + • fcntl + • functools + • os + • platform + • psutil + • shutil + • struct + • subprocess + • sys + • termios + • threading + • types + +
+
+imported by: + psutil + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._psposix + • psutil._pssunos + • psutil._pswindows + +
+ +
+ +
+ + psutil._psaix +SourceModule
+imports: + collections + • functools + • glob + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psposix + • psutil._psutil_aix + • re + • subprocess + • sys + +
+
+imported by: + psutil + +
+ +
+ +
+ + psutil._psbsd +SourceModule
+imports: + collections + • contextlib + • errno + • functools + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psposix + • psutil._psutil_bsd + • xml.etree.ElementTree + +
+
+imported by: + psutil + +
+ +
+ +
+ + psutil._pslinux +SourceModule
+imports: + __future__ + • base64 + • collections + • ctypes + • enum + • errno + • functools + • glob + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psposix + • psutil._psutil_linux + • re + • resource + • socket + • struct + • sys + • traceback + • warnings + +
+
+imported by: + psutil + +
+ +
+ +
+ + psutil._psosx +SourceModule
+imports: + collections + • errno + • functools + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psposix + • psutil._psutil_osx + +
+
+imported by: + psutil + +
+ +
+ +
+ + psutil._psposix +SourceModule
+imports: + enum + • glob + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psutil_osx + • signal + • sys + • time + +
+
+imported by: + psutil + • psutil._psaix + • psutil._psbsd + • psutil._pslinux + • psutil._psosx + • psutil._pssunos + +
+ +
+ +
+ + psutil._pssunos +SourceModule
+imports: + collections + • errno + • functools + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psposix + • psutil._psutil_sunos + • socket + • subprocess + • sys + +
+
+imported by: + psutil + +
+ +
+ +
+ + psutil._psutil_aix +MissingModule
+imported by: + psutil + • psutil._psaix + +
+ +
+ +
+ + psutil._psutil_bsd +MissingModule
+imported by: + psutil + • psutil._psbsd + +
+ +
+ +
+ + psutil._psutil_linux +MissingModule
+imported by: + psutil + • psutil._pslinux + +
+ +
+ +
+ + psutil._psutil_osx +MissingModule
+imported by: + psutil + • psutil._psosx + • psutil._psposix + +
+ +
+ +
+ + psutil._psutil_sunos +MissingModule
+imported by: + psutil + • psutil._pssunos + +
+ +
+ +
+ + psutil._psutil_windows C:\Users\Sebastian Serfling\PycharmProjects\server-info\venv\lib\site-packages\psutil\_psutil_windows.pyd
+imports: + psutil + +
+
+imported by: + psutil + • psutil._pswindows + +
+ +
+ +
+ + psutil._pswindows +SourceModule
+imports: + collections + • contextlib + • enum + • errno + • functools + • os + • psutil + • psutil._common + • psutil._compat + • psutil._psutil_windows + • signal + • sys + • time + +
+
+imported by: + psutil + +
+ +
+
psycopg2 @@ -11868,6 +12463,7 @@ imported by: • netrc • pathlib • posixpath + • psutil • shutil • subprocess • tarfile @@ -11914,7 +12510,9 @@ imported by: pyexpat C:\Users\Sebastian Serfling\AppData\Local\Programs\Python\Python39\DLLs\pyexpat.pyd
imported by: - xml.parsers.expat + _elementtree + • xml.etree.ElementTree + • xml.parsers.expat
@@ -12069,6 +12667,7 @@ imported by: • fractions • ftplib • gettext + • glob • http.client • http.cookiejar • http.cookies @@ -12096,6 +12695,8 @@ imported by: • platform • posixpath • pprint + • psutil._psaix + • psutil._pslinux • psycopg2._range • psycopg2.extensions • psycopg2.extras @@ -12116,6 +12717,8 @@ imported by: • urllib3.util.ssl_match_hostname • urllib3.util.url • warnings + • xml.etree.ElementPath + • xml.etree.ElementTree
@@ -12606,6 +13209,7 @@ imported by: MissingModule
imported by: posix + • psutil._pslinux
@@ -12699,6 +13303,7 @@ imports:
imported by: argparse + • psutil._compat • tarfile • tempfile • uuid @@ -12720,6 +13325,9 @@ imports:
imported by: paramiko.proxy + • psutil + • psutil._psposix + • psutil._pswindows • subprocess
@@ -12773,6 +13381,10 @@ imported by: • paramiko.ssh_exception • paramiko.transport • platform + • psutil + • psutil._common + • psutil._pslinux + • psutil._pssunos • requests.adapters • requests.utils • socketserver @@ -13007,6 +13619,7 @@ imported by: • paramiko.sftp_client • pathlib • posixpath + • psutil._common • shutil • tarfile • zipfile @@ -13112,6 +13725,8 @@ imported by: • paramiko.win_pageant • pickle • platform + • psutil._compat + • psutil._pslinux • requests.utils • tarfile • zipfile @@ -13153,6 +13768,10 @@ imported by: • os • paramiko.proxy • platform + • psutil + • psutil._compat + • psutil._psaix + • psutil._pssunos • uuid
@@ -13180,6 +13799,7 @@ imported by: • cryptography.x509.name • ctypes • ctypes._endian + • curses • dataclasses • datetime • dis @@ -13197,6 +13817,7 @@ imported by: • getopt • getpass • gettext + • glob • gzip • importlib • importlib._bootstrap_external @@ -13228,6 +13849,14 @@ imported by: • platform • posixpath • pprint + • psutil + • psutil._common + • psutil._compat + • psutil._psaix + • psutil._pslinux + • psutil._psposix + • psutil._pssunos + • psutil._pswindows • py_compile • pyi_rth_inspect.py • pyi_rth_pywintypes.py @@ -13262,6 +13891,7 @@ imported by: • uuid • warnings • weakref + • xml.etree.ElementTree • xml.parsers.expat • xml.sax • xml.sax._exceptions @@ -13342,6 +13972,7 @@ imported by: MissingModule
imported by: getpass + • psutil._compat
@@ -13402,6 +14033,9 @@ imported by: • paramiko.sftp_file • paramiko.transport • paramiko.util + • psutil + • psutil._common + • psutil._compat • queue • requests.auth • requests.cookies @@ -13452,6 +14086,9 @@ imported by: • paramiko.transport • paramiko.win_openssh • pprint + • psutil + • psutil._psposix + • psutil._pswindows • psycopg2.extras • queue • random @@ -13532,6 +14169,7 @@ imported by: • logging • main.py • paramiko.util + • psutil._pslinux • py_compile • socketserver • threading @@ -13595,6 +14233,7 @@ imported by: • main.py • pickle • pprint + • psutil._compat • queue • subprocess • tempfile @@ -13811,6 +14450,7 @@ imported by: • urllib.robotparser • urllib3._request_methods • urllib3.poolmanager + • xml.etree.ElementInclude • xml.sax.saxutils • xmlrpc.client @@ -14888,6 +15528,8 @@ imported by: • main.py • os • paramiko.client + • psutil._common + • psutil._pslinux • psycopg2.extras • random • requests @@ -14912,6 +15554,7 @@ imported by: • urllib3.poolmanager • urllib3.response • urllib3.util.ssl_ + • xml.etree.ElementTree • zipfile @@ -14988,13 +15631,124 @@ imports:
imported by: - xml.parsers + xml.etree + • xml.parsers • xml.sax
+
+ + xml.etree +Package
+imports: + xml + • xml.etree + • xml.etree.ElementPath + • xml.etree.ElementTree + +
+
+imported by: + xml.etree + • xml.etree.ElementInclude + • xml.etree.ElementPath + • xml.etree.ElementTree + • xml.etree.cElementTree + +
+ +
+ +
+ + xml.etree.ElementInclude +SourceModule
+imports: + copy + • urllib.parse + • xml.etree + • xml.etree.ElementTree + +
+
+imported by: + _elementtree + +
+ +
+ +
+ + xml.etree.ElementPath +SourceModule
+imports: + re + • xml.etree + +
+
+imported by: + _elementtree + • xml.etree + • xml.etree.ElementTree + +
+ +
+ +
+ + xml.etree.ElementTree +SourceModule
+imports: + _elementtree + • collections + • collections.abc + • contextlib + • io + • pyexpat + • re + • sys + • warnings + • xml.etree + • xml.etree.ElementPath + • xml.parsers + • xml.parsers.expat + +
+
+imported by: + _elementtree + • psutil._psbsd + • xml.etree + • xml.etree.ElementInclude + • xml.etree.cElementTree + +
+ +
+ +
+ + xml.etree.cElementTree +SourceModule
+imports: + xml.etree + • xml.etree.ElementTree + +
+
+imported by: + _elementtree + +
+ +
+
xml.parsers @@ -15006,7 +15760,8 @@ imports:
imported by: - xml.parsers.expat + xml.etree.ElementTree + • xml.parsers.expat • xml.sax.expatreader • xmlrpc.client @@ -15026,7 +15781,8 @@ imports:
imported by: - xml.parsers + xml.etree.ElementTree + • xml.parsers • xml.sax.expatreader • xmlrpc.client diff --git a/dist/main.exe b/dist/main.exe index f317d46..96d8782 100644 Binary files a/dist/main.exe and b/dist/main.exe differ diff --git a/main.py b/main.py index 0588963..206cf9f 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ import socket -from Controller import adcontroller_export, exchange_export, rds_export, smtp_export, zammad, mysql_connect +from Controller import adcontroller_export, exchange_export, rds_export, smtp_export, zammad,system_info,mysql_connect def get_local_ip(): try: @@ -18,6 +18,9 @@ def get_local_ip(): print(f"Fehler beim Abrufen der lokalen IP-Adresse: {e}") return None +def system_info_get(ip,name): + system_info.set_system_info(name,ip) + def adcontroller(ip,name): adcontroller_export.adcontroller(ip, name) @@ -70,7 +73,7 @@ def gucamole(ip,servername): print("" + ip + servername) query = "SELECT * FROM `Stines-GmbH`.`Kunden-Server` WHERE `IP-Adresse` = ""'{}'""".format(get_local_ip()) -# query = "SELECT * FROM `Stines-GmbH`.`Kunden-Server` WHERE `IP-Adresse` = ""'{}'""".format("172.19.1.3") +# query = "SELECT * FROM `Stines-GmbH`.`Kunden-Server` WHERE `IP-Adresse` = ""'{}'""".format("172.18.1.6") list = mysql_connect.get_ip(query) @@ -106,5 +109,6 @@ for row in list: eval(funktion + '("' + ipadress + '","' + name + '","' + token + '")') else: eval(funktion + '("' + ipadress + '","' + name + '")') + eval(system_info + '("' + ipadress + '","' + name + '")') except NameError: print("Die Funktion existiert nicht.") \ No newline at end of file