diff --git a/Controller/adcontroller_export.py b/Controller/adcontroller_export.py index bc12bf2..1e9881f 100644 --- a/Controller/adcontroller_export.py +++ b/Controller/adcontroller_export.py @@ -8,9 +8,8 @@ def adcontroller (ip,name): command = ["powershell", "-Command", "Get-ADUser -Filter * -Properties * | Export-Csv -NoTypeInformation -Encoding UTF8 -Path 'users.csv'"] subprocess.run(command) - # CSV-Datei einlesen und Feldnamen auslesen - with open("../users.csv", "r", encoding='utf-8-sig') as file: + with open("users.csv", "r", encoding='utf-8-sig') as file: reader = csv.DictReader(file) fieldnames = reader.fieldnames @@ -23,7 +22,7 @@ def adcontroller (ip,name): mysql_connect.create_database(create_table_query, name) # Daten aus der CSV-Datei in die Tabelle einfügen - with open("../users.csv", "r", encoding='utf-8-sig') as file: + with open("users.csv", "r", encoding='utf-8-sig') as file: reader = csv.reader(file) next(reader) # Überspringe die erste Zeile (Feldnamen) for row in reader: @@ -41,7 +40,7 @@ def adcontroller (ip,name): subprocess.run(command) # CSV-Datei einlesen und Feldnamen auslesen - with open("../group.csv", "r", encoding='utf-8-sig') as file: + with open("group.csv", "r", encoding='utf-8-sig') as file: reader = csv.DictReader(file) fieldnames = reader.fieldnames table_name = "Active-Directory-RDS-User" @@ -52,7 +51,7 @@ def adcontroller (ip,name): mysql_connect.create_database(create_table_query, name) # Daten aus der CSV-Datei in die Tabelle aktualisieren oder einfügen - with open("../group.csv", "r", encoding='utf-8-sig') as file: + with open("group.csv", "r", encoding='utf-8-sig') as file: reader = csv.DictReader(file) for row in reader: sam_account_name = row["SamAccountName"] diff --git a/build/main/Analysis-00.toc b/build/main/Analysis-00.toc index a4171c6..2ffa922 100644 --- a/build/main/Analysis-00.toc +++ b/build/main/Analysis-00.toc @@ -531,9 +531,9 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\_threading_local.py', 'PYMODULE'), - ('tracemalloc', + ('_py_abc', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\tracemalloc.py', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\_py_abc.py', 'PYMODULE'), ('getpass', 'C:\\Users\\Sebastian ' @@ -567,9 +567,9 @@ 'C:\\Users\\Sebastian ' 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\stringprep.py', 'PYMODULE'), - ('_py_abc', + ('tracemalloc', 'C:\\Users\\Sebastian ' - 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\_py_abc.py', + 'Serfling\\AppData\\Local\\Programs\\Python\\Python39\\lib\\tracemalloc.py', 'PYMODULE'), ('Controller.mysql_connect', 'C:\\Users\\Sebastian ' @@ -1868,63 +1868,63 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libmysql.dll', 'BINARY'), + ('libcrypto-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', + 'BINARY'), ('libssl-3-x64.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', 'BINARY'), - ('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')], + ('MSVCP140.dll', 'C:\\Windows\\system32\\MSVCP140.dll', 'BINARY')], [], [], [('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE.APACHE', + ('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.APACHE', + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.BSD', 'DATA'), ('cryptography-41.0.2.dist-info\\top_level.txt', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', 'DATA'), - ('certifi\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\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\\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'), - ('cryptography-41.0.2.dist-info\\INSTALLER', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', - 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', - 'DATA'), ('cryptography-41.0.2.dist-info\\WHEEL', 'c:\\users\\sebastian ' 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE.BSD', + ('cryptography-41.0.2.dist-info\\INSTALLER', 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE.BSD', + '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\\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\\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\\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\\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 71bbe97..f4d89f0 100644 --- a/build/main/EXE-00.toc +++ b/build/main/EXE-00.toc @@ -191,67 +191,67 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libmysql.dll', 'BINARY'), + ('libcrypto-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', + 'BINARY'), ('libssl-3-x64.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', 'BINARY'), ('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'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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'), - ('certifi\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\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\\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'), - ('cryptography-41.0.2.dist-info\\INSTALLER', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', - 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', - 'DATA'), - ('cryptography-41.0.2.dist-info\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', - 'DATA'), ('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\\top_level.txt', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'DATA'), + ('nacl\\py.typed', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', + 'DATA'), + ('cryptography-41.0.2.dist-info\\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\\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\\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\\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\\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\\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, - 1691017907, + 1691018067, [('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 5c3a939..35c596c 100644 --- a/build/main/PKG-00.toc +++ b/build/main/PKG-00.toc @@ -183,62 +183,62 @@ 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libmysql.dll', 'BINARY'), + ('libcrypto-3-x64.dll', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libcrypto-3-x64.dll', + 'BINARY'), ('libssl-3-x64.dll', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\libssl-3-x64.dll', 'BINARY'), ('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'), ('base_library.zip', 'C:\\Users\\Sebastian ' 'Serfling\\PycharmProjects\\server-info\\build\\main\\base_library.zip', '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'), - ('certifi\\py.typed', - 'C:\\Users\\Sebastian ' - 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\certifi\\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\\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'), - ('cryptography-41.0.2.dist-info\\INSTALLER', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\INSTALLER', - 'DATA'), - ('cryptography-41.0.2.dist-info\\LICENSE', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\LICENSE', - 'DATA'), - ('cryptography-41.0.2.dist-info\\WHEEL', - 'c:\\users\\sebastian ' - 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\WHEEL', - 'DATA'), ('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\\top_level.txt', + 'c:\\users\\sebastian ' + 'serfling\\pycharmprojects\\server-info\\venv\\lib\\site-packages\\cryptography-41.0.2.dist-info\\top_level.txt', + 'DATA'), + ('nacl\\py.typed', + 'C:\\Users\\Sebastian ' + 'Serfling\\PycharmProjects\\server-info\\venv\\lib\\site-packages\\nacl\\py.typed', + 'DATA'), + ('cryptography-41.0.2.dist-info\\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\\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\\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\\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\\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\\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 87b08e5..9b7fb76 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 bd6bb4e..b7ae064 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 b193a91..96e38c4 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 195b934..5bba438 100644 --- a/build/main/warn-main.txt +++ b/build/main/warn-main.txt @@ -18,7 +18,7 @@ missing module named _frozen_importlib_external - imported by importlib._bootstr excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional), zipimport (top-level) missing module named pep517 - imported by importlib.metadata (delayed) missing module named org - imported by pickle (optional) -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) 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) diff --git a/dist/main.exe b/dist/main.exe index aaf3a32..5d73ff3 100644 Binary files a/dist/main.exe and b/dist/main.exe differ