diff --git a/net_alerter/net_alerter.py b/net_alerter/net_alerter.py index 82a923e..5566307 100644 --- a/net_alerter/net_alerter.py +++ b/net_alerter/net_alerter.py @@ -919,19 +919,18 @@ def fmt_duration(secs: float) -> str: def format_arrival(hostname: str, ip: str, vendor: str, mac: str) -> str: - """Format arrival alert message. Discovered hostname takes precedence; label is fallback.""" + """Format arrival alert message. Label always wins when set; hostname is fallback.""" label = device_labels.get(_normalize_mac(mac)) - # Use discovered hostname if it's real (not just the IP); fall back to label - display = (hostname if hostname and hostname != ip else None) or label + display = label or (hostname if hostname and hostname != ip else None) if display: return f"[NET] ARRIVED: {display} ({ip})" return f"[NET] ARRIVED: {ip} [{vendor}] MAC:{mac}" def format_departure(hostname: str, ip: str, vendor: str, mac: str, duration: str) -> str: - """Format departure alert message. Discovered hostname takes precedence; label is fallback.""" + """Format departure alert message. Label always wins when set; hostname is fallback.""" label = device_labels.get(_normalize_mac(mac)) - display = (hostname if hostname and hostname != ip else None) or label + display = label or (hostname if hostname and hostname != ip else None) if display: return f"[NET] DEPARTED: {display} ({ip}) — present {duration}" return f"[NET] DEPARTED: {ip} [{vendor}] MAC:{mac} — present {duration}"