From 125599e86adee43fad32ff780fe43f6c1cebf7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Mon, 10 Mar 2025 15:29:41 +0100 Subject: [PATCH] proba naprawy --- app.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index efa4e4e..53e7619 100644 --- a/app.py +++ b/app.py @@ -424,6 +424,17 @@ def format_host(host): resolved_name = host.resolved_hostname or host.hostname return f"{resolved_name} ({host.raw_ip})" +def remove_local_defaults(content, user_id): + local_defaults = LocalDefaultEntry.query.filter_by(user_id=user_id).all() + lines = content.splitlines() + cleaned_lines = [] + + for line in lines: + stripped_line = line.strip() + if not any(stripped_line.startswith(f"{entry.ip_address} {entry.hostname}") for entry in local_defaults): + cleaned_lines.append(stripped_line) + + return "\n".join(cleaned_lines) + "\n" # ------------------- # LOGOWANIE, REJESTRACJA, ZMIANA HASŁA @@ -1271,13 +1282,14 @@ def deploy_user(user_id): else: chosen_file = default_file - # 🛠 Jeśli disable_local_default jest włączone → wgraj tylko wybrany plik hosts + # Wstępna zawartość - pobrany plik hosts + final_content = chosen_file.content.strip() + + # Jeśli disable_local_default jest włączone → usuwamy local-defaults, ale reszta pozostaje if h.disable_local_default: - final_content = chosen_file.content.strip() + final_content = remove_local_defaults(final_content, user_id) else: - # W przeciwnym wypadku dodaj regex i ensure_local_defaults - final_content = chosen_file.content.strip() - + # Dodaj regex, jeśli nie jest wyłączony if not h.disable_regex_deploy and regex_lines.strip(): final_content = regex_lines + "\n" + final_content