dev #2

Merged
alientim merged 32 commits from dev into main 2025-10-12 17:19:37 +02:00
Showing only changes of commit 78ed058d69 - Show all commits

View File

@@ -6,7 +6,10 @@ def generate_ips_list():
conn = sqlite3.connect(DB_PATH) conn = sqlite3.connect(DB_PATH)
conn.row_factory = sqlite3.Row conn.row_factory = sqlite3.Row
switches = {row['hostname']: row for row in conn.execute("SELECT hostname, ip, username, password FROM switches")} switches = {row['hostname']: row for row in conn.execute(
"SELECT hostname, ip, username, password FROM switches"
)}
devices = conn.execute(""" devices = conn.execute("""
SELECT mac, rpi_ip, port, name, switch_hostname SELECT mac, rpi_ip, port, name, switch_hostname
FROM devices FROM devices
@@ -14,8 +17,7 @@ def generate_ips_list():
""").fetchall() """).fetchall()
conn.close() conn.close()
for dev in devices: for dev in devices:
# Switchdaten holen, falls vorhanden
switch = switches.get(dev['switch_hostname']) switch = switches.get(dev['switch_hostname'])
if switch: if switch:
switch_ip = switch['ip'] switch_ip = switch['ip']
@@ -27,7 +29,7 @@ for dev in devices:
switch_pass = "" switch_pass = ""
port = dev['port'] or "" port = dev['port'] or ""
print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or ''}:{port}:{switch_user}:{switch_pass}") print(f"{dev['rpi_ip']}:{dev['name']}:{switch_ip}:{dev['switch_hostname'] or 'kein Switch'}:{port}:{switch_user}:{switch_pass}")
if __name__ == "__main__": if __name__ == "__main__":
generate_ips_list() generate_ips_list()