Match name and preferred address case-insensitively in build_log_name

aioesphomeapi/util.py

@@ -88,8 +88,8 @@ def build_log_name(
         return name or addresses[0]
     if (
         name
-        and name != preferred_address
-        and not preferred_address.startswith(f"{name}.")
+        and name.lower() != preferred_address.lower()
+        and not preferred_address.lower().startswith(f"{name.lower()}.")
     ):
         return f"{name} @ {preferred_address}"
     return preferred_address

tests/test_util.py

@@ -5,7 +5,7 @@
 import pytest
 
 from aioesphomeapi import util
-from aioesphomeapi.util import address_is_local, is_ip_address
+from aioesphomeapi.util import address_is_local, build_log_name, is_ip_address
 
 
 @pytest.mark.parametrize(
@@ -138,3 +138,42 @@ def test_is_ip_address(address: str | None, expected: bool) -> None:
 )
 def test_address_is_local(address: str, expected: bool) -> None:
     assert address_is_local(address) is expected
+
+
+@pytest.mark.parametrize(
+    ("name", "addresses", "connected_address", "expected"),
+    [
+        # Bare hostname only.
+        ("myesp", ["myesp"], None, "myesp"),
+        (None, ["myesp"], None, "myesp"),
+        # mDNS .local only.
+        (None, ["myesp.local"], None, "myesp"),
+        ("myesp", ["myesp.local"], None, "myesp.local"),
+        # IP only.
+        (None, ["192.168.1.10"], None, "192.168.1.10"),
+        ("myesp", ["192.168.1.10"], None, "myesp @ 192.168.1.10"),
+        # Connected address provided.
+        ("myesp", ["192.168.1.10"], "192.168.1.10", "myesp @ 192.168.1.10"),
+        (None, ["10.0.0.1"], "192.168.1.10", "192.168.1.10"),
+        ("myesp", ["myesp"], "192.168.1.10", "myesp @ 192.168.1.10"),
+        # Multiple addresses: name derived from one, IP becomes preferred.
+        (None, ["myesp", "192.168.1.10"], None, "myesp @ 192.168.1.10"),
+        (None, ["myesp.local", "192.168.1.10"], None, "myesp @ 192.168.1.10"),
+        (None, ["192.168.1.10", "myesp.local"], None, "myesp @ 192.168.1.10"),
+        # Case-insensitive prefix match between name and .local address.
+        ("myesp", ["MYESP.local"], None, "MYESP.local"),
+        ("MYESP", ["myesp.local"], None, "myesp.local"),
+        # Bare hostname overrides supplied name (loop reassigns).
+        ("alice", ["bob"], None, "bob"),
+        # Bracketed IPv6 as preferred address.
+        ("myesp", ["[::1]:6053"], None, "myesp @ [::1]:6053"),
+        (None, ["[::1]:6053"], None, "[::1]:6053"),
+    ],
+)
+def test_build_log_name(
+    name: str | None,
+    addresses: list[str],
+    connected_address: str | None,
+    expected: str,
+) -> None:
+    assert build_log_name(name, addresses, connected_address) == expected