Show vendor of Bluetooth address if it has a known OUI (#37)

Author: koenvervloesem

src/humble_explorer/app.py

@@ -252,7 +252,7 @@ def add_advertisement_to_table(
                 now,
                 device_address,
                 rich_advertisement,
-                height=rich_advertisement.height(),
+                height=max(device_address.height(), rich_advertisement.height()),
             )
             self.scroll_if_autoscroll()
 

src/humble_explorer/renderables.py

@@ -6,8 +6,13 @@
 from uuid import UUID
 
 from bleak.backends.scanner import AdvertisementData
-from bluetooth_numbers import company, service
-from bluetooth_numbers.exceptions import UnknownCICError, UnknownUUIDError
+from bluetooth_numbers import company, oui, service
+from bluetooth_numbers.exceptions import (
+    UnknownCICError,
+    UnknownOUIError,
+    UnknownUUIDError,
+    WrongOUIFormatError,
+)
 from rich._palettes import EIGHT_BIT_PALETTE
 from rich.style import Style
 from rich.table import Table
@@ -50,7 +55,7 @@ def __rich__(self) -> Text:
 
 
 class RichDeviceAddress:
-    """Rich renderable that shows a Bluetooth device address.
+    """Rich renderable that shows a Bluetooth device address aand OUI description.
 
     Every address is rendered in its own color.
     """
@@ -63,13 +68,28 @@ def __init__(self, address: str) -> None:
         """
         self.address = address
         self.style = Style(color=EIGHT_BIT_PALETTE[hash8(self.address)].hex)
+        try:
+            self.oui = oui[self.address[:8]]
+        except (UnknownOUIError, WrongOUIFormatError):
+            # This could be macOS that returns a UUID instead of Bluetooth address
+            self.oui = ""
+
+    def height(self) -> int:
+        """Return the number of lines this Rich renderable uses."""
+        height = 1
+        if self.oui:
+            height += 1
+        return height  # noqa: R504
 
     def __rich__(self) -> Text:
         """Render the RichDeviceAddress object.
 
         Returns:
             Text: The rendering of the RichDeviceAddress object.
         """
+        if self.oui:
+            return Text.assemble(Text(self.address, style=self.style), f"\n{self.oui}")
+
         return Text(self.address, style=self.style)
 
 

tests/test_renderables.py

@@ -36,10 +36,20 @@ def test_device_address() -> None:
     device_address = RichDeviceAddress(address_string)
     device_address2 = RichDeviceAddress(address_string)
     assert str(device_address.__rich__()) == address_string
+    assert device_address.height() == 1
 
     # Devices with the same address should have the same color
     assert device_address.style == device_address2.style
 
+    # Address with known OUI should show company description
+    address_string_qingping = "58:2D:34:54:2D:2C"
+    full_address_string_qingping = (
+        "58:2D:34:54:2D:2C\nQingping Electronics (Suzhou) Co., Ltd"
+    )
+    device_address_qingping = RichDeviceAddress(address_string_qingping)
+    assert str(device_address_qingping.__rich__()) == full_address_string_qingping
+    assert device_address_qingping.height() == 2
+
 
 def test_rssi() -> None:
     """Test RichRSSI class."""