router-cli 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

router_cli/config.py

@@ -47,20 +47,96 @@ def load_config() -> dict:
         'password = "your_password"\n'
         "\n"
         "[known_devices]\n"
-        '"AA:BB:CC:DD:EE:FF" = "My Phone"\n'
-        '"11:22:33:44:55:66" = "Smart TV"'
+        '"AA:BB:CC:DD:EE:FF" = "My Phone"      # by MAC address\n'
+        '"android-abc123" = "Pixel Phone"     # by hostname (for random MACs)'
     )
 
 
-def load_known_devices() -> dict[str, str]:
+def _is_mac_address(identifier: str) -> bool:
+    """Check if a string looks like a MAC address.
+
+    MAC addresses contain colons and are in format XX:XX:XX:XX:XX:XX
+    """
+    import re
+
+    # Match typical MAC address formats (with colons)
+    return bool(re.match(r"^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$", identifier))
+
+
+class KnownDevices:
+    """Container for known devices, supporting lookup by MAC or hostname.
+
+    This class supports devices that use random MAC addresses by allowing
+    hostname-based identification in addition to MAC-based.
+    """
+
+    def __init__(
+        self,
+        by_mac: dict[str, str] | None = None,
+        by_hostname: dict[str, str] | None = None,
+    ):
+        self.by_mac: dict[str, str] = by_mac or {}
+        self.by_hostname: dict[str, str] = by_hostname or {}
+
+    def get_alias(self, mac: str, hostname: str = "") -> str | None:
+        """Get alias for a device by MAC or hostname.
+
+        MAC lookup takes priority. Returns None if device is not known.
+        """
+        # First try MAC lookup (normalized to uppercase)
+        alias = self.by_mac.get(mac.upper())
+        if alias:
+            return alias
+
+        # Then try hostname lookup (case-insensitive)
+        if hostname:
+            alias = self.by_hostname.get(hostname.lower())
+            if alias:
+                return alias
+
+        return None
+
+    def is_known(self, mac: str, hostname: str = "") -> bool:
+        """Check if a device is known by MAC or hostname."""
+        return self.get_alias(mac, hostname) is not None
+
+    def get(self, key: str, default: str | None = None) -> str | None:
+        """Dict-like get for backward compatibility (MAC lookup only)."""
+        return self.by_mac.get(key, default)
+
+    def __contains__(self, key: str) -> bool:
+        """Dict-like contains for backward compatibility (MAC lookup only)."""
+        return key in self.by_mac
+
+
+def load_known_devices() -> KnownDevices:
     """Load known devices from config file.
 
-    Returns a dict mapping MAC addresses (uppercase) to aliases.
+    Returns a KnownDevices object supporting lookup by MAC address or hostname.
+
+    Config format:
+        [known_devices]
+        "AA:BB:CC:DD:EE:FF" = "My Phone"      # MAC-based (for stable MACs)
+        "android-abc123" = "John's Pixel"     # Hostname-based (for random MACs)
+
+    MAC addresses are identified by format (XX:XX:XX:XX:XX:XX with colons).
+    Any other identifier is treated as a hostname.
     """
     config = _load_config_file()
     if config is None:
-        return {}
+        return KnownDevices()
 
     known = config.get("known_devices", {})
-    # Normalize MAC addresses to uppercase for case-insensitive matching
-    return {mac.upper(): alias for mac, alias in known.items()}
+
+    by_mac: dict[str, str] = {}
+    by_hostname: dict[str, str] = {}
+
+    for identifier, alias in known.items():
+        if _is_mac_address(identifier):
+            # MAC address - normalize to uppercase
+            by_mac[identifier.upper()] = alias
+        else:
+            # Hostname - normalize to lowercase for case-insensitive matching
+            by_hostname[identifier.lower()] = alias
+
+    return KnownDevices(by_mac=by_mac, by_hostname=by_hostname)

router_cli/main.py

@@ -22,7 +22,7 @@ from .client import (
     Statistics,
     WirelessClient,
 )
-from .config import load_config, load_known_devices
+from .config import KnownDevices, load_config, load_known_devices
 
 
 # ANSI color codes
@@ -130,14 +130,20 @@ def spinner(message: str = "Loading..."):
 
 
 def get_device_display(
-    mac: str, hostname: str, known_devices: dict[str, str]
+    mac: str, hostname: str, known_devices: KnownDevices | None
 ) -> tuple[str, bool]:
     """Get display name for a device and whether it's known.
 
     Returns (display_name, is_known) tuple.
     If known, display_name is 'Alias (hostname)'.
+
+    Supports lookup by both MAC address and hostname (for devices with
+    random MAC addresses like some Android phones).
     """
-    alias = known_devices.get(mac.upper())
+    if known_devices is None:
+        return hostname or mac, False
+
+    alias = known_devices.get_alias(mac, hostname)
     if alias:
         if hostname and hostname != alias:
             return f"{alias} ({hostname})", True
@@ -220,21 +226,22 @@ def format_status(status: RouterStatus) -> str:
 
 
 def format_clients(
-    clients: list[WirelessClient], known_devices: dict[str, str] | None = None
+    clients: list[WirelessClient], known_devices: KnownDevices | None = None
 ) -> str:
     """Format wireless clients for display."""
     if not clients:
         return "No wireless clients connected."
 
-    known_devices = known_devices or {}
+    known_devices = known_devices or KnownDevices()
 
     # Build display data and calculate column widths
     rows = []
     for c in clients:
         assoc = "Yes" if c.associated else "No"
         auth = "Yes" if c.authorized else "No"
-        is_known = c.mac.upper() in known_devices
-        alias = known_devices.get(c.mac.upper(), "")
+        # WirelessClient doesn't have hostname, so we can only check by MAC
+        alias = known_devices.get_alias(c.mac, "")
+        is_known = alias is not None
         mac_display = f"{c.mac} ({alias})" if alias else c.mac
         rows.append((mac_display, assoc, auth, c.ssid, c.interface, is_known))
 
@@ -268,13 +275,13 @@ def format_clients(
 
 
 def format_dhcp(
-    leases: list[DHCPLease], known_devices: dict[str, str] | None = None
+    leases: list[DHCPLease], known_devices: KnownDevices | None = None
 ) -> str:
     """Format DHCP leases for display."""
     if not leases:
         return "No DHCP leases."
 
-    known_devices = known_devices or {}
+    known_devices = known_devices or KnownDevices()
 
     # Build display data and calculate column widths
     rows = []
@@ -421,10 +428,10 @@ def format_overview(
     clients: list[WirelessClient],
     leases: list[DHCPLease],
     stats: Statistics,
-    known_devices: dict[str, str] | None = None,
+    known_devices: KnownDevices | None = None,
 ) -> str:
     """Format overview dashboard with highlights from multiple sources."""
-    known_devices = known_devices or {}
+    known_devices = known_devices or KnownDevices()
     lines = [
         "=" * 60,
         f"{'ROUTER OVERVIEW':^60}",
@@ -512,7 +519,9 @@ def format_overview(
             f"  Low SNR margin: {stats.adsl.downstream_snr_margin:.1f} dB (may cause disconnects)"
         )
     # Warn about unknown devices
-    unknown_count = sum(1 for lease in leases if lease.mac.upper() not in known_devices)
+    unknown_count = sum(
+        1 for lease in leases if not known_devices.is_known(lease.mac, lease.hostname)
+    )
     if unknown_count > 0:
         warnings.append(
             colorize(f"  Unknown devices on network: {unknown_count}", "red")

{router_cli-0.1.0.dist-info → router_cli-0.2.0.dist-info}/METADATA

@@ -1,11 +1,26 @@
 Metadata-Version: 2.3
 Name: router-cli
-Version: 0.1.0
+Version: 0.2.0
 Summary: CLI tool to manage D-Link DSL-2750U router
+Keywords: router,cli,dlink,dsl-2750u,network,admin
 Author: d3vr
 Author-email: d3vr <hi@f3.al>
+License: MIT
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Console
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: System :: Networking
 Requires-Dist: tomli>=2.0.0 ; python_full_version < '3.11'
 Requires-Python: >=3.10
+Project-URL: Homepage, https://github.com/d3vr/router-cli
+Project-URL: Repository, https://github.com/d3vr/router-cli
+Project-URL: Issues, https://github.com/d3vr/router-cli/issues
 Description-Content-Type: text/markdown
 
 # router-cli
@@ -58,10 +73,12 @@ username = "admin"
 password = "your_password_here"
 
 # Optional: Define known devices for colorized output
+# Use MAC addresses for devices with stable MACs
+# Use hostnames for devices with random MACs (like Android)
 [known_devices]
 "AA:BB:CC:DD:EE:FF" = "My Phone"
 "11:22:33:44:55:66" = "Smart TV"
-"DE:AD:BE:EF:00:01" = "Work Laptop"
+"android-abc123" = "John's Pixel"
 ```
 
 The tool searches for configuration in the following locations (in order):
@@ -189,7 +206,7 @@ Sends a reboot command to the router.
 
 ## Known Devices
 
-The `[known_devices]` section in your config file maps MAC addresses to friendly names. This enables:
+The `[known_devices]` section in your config file maps MAC addresses or hostnames to friendly names. This enables:
 
 - **Color-coded output**: Known devices appear in green, unknown in red
 - **Friendly names**: See "My Phone" instead of a hostname or MAC address
@@ -197,11 +214,18 @@ The `[known_devices]` section in your config file maps MAC addresses to friendly
 
 ```toml
 [known_devices]
+# By MAC address (for devices with stable MACs)
 "AA:BB:CC:DD:EE:FF" = "My Phone"
 "11:22:33:44:55:66" = "Smart TV"
+
+# By hostname (for devices with random MACs, like some Android phones)
+"android-abc123def" = "John's Pixel"
+"Galaxy-S24" = "Sarah's Phone"
 ```
 
-MAC addresses are matched case-insensitively.
+**MAC addresses** are identified by their format (`XX:XX:XX:XX:XX:XX`) and matched case-insensitively.
+
+**Hostnames** are useful for Android and iOS devices that use MAC address randomization for privacy. These devices typically maintain a consistent hostname even when their MAC changes. Hostnames are also matched case-insensitively.
 
 ## Development
 

router_cli-0.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+router_cli/__init__.py,sha256=R-j6ZUnvZT4qKwxPGaYBQEOCLsPATLn1qHLHSmdfo2c,74
+router_cli/client.py,sha256=DuOqZvsCkcgut2k0LqKcdYD_rN4E1TRtwfqm9bnJTEU,29631
+router_cli/config.py,sha256=fn0_Mcy0Py-7k-yZwPEsXl3MhcspkKgzal-JHjBfAD8,4446
+router_cli/main.py,sha256=iLCR1VaPrb1PvXpPdNciH7Y2-68zXAQ9YK0TmzepgJ8,22809
+router_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+router_cli-0.2.0.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+router_cli-0.2.0.dist-info/entry_points.txt,sha256=PfkydZeDJvlgvEXYOG1gYvbTM39Cm-OgsPpREH3UNAU,49
+router_cli-0.2.0.dist-info/METADATA,sha256=8zwKVYYwOP5F7QDRnS-xB-svOE3VTPe-EZM-8D4iO6A,6826
+router_cli-0.2.0.dist-info/RECORD,,

router_cli-0.1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-router_cli/__init__.py,sha256=R-j6ZUnvZT4qKwxPGaYBQEOCLsPATLn1qHLHSmdfo2c,74
-router_cli/client.py,sha256=DuOqZvsCkcgut2k0LqKcdYD_rN4E1TRtwfqm9bnJTEU,29631
-router_cli/config.py,sha256=SX1s1CJk_XiiCHlZ47I9vgda9IRqqUwBTQKjC3BYoVE,1803
-router_cli/main.py,sha256=UzIYNKIM9f4NQ2UW-wenI8yQRVKMVMiPyaXPjyTggaU,22469
-router_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-router_cli-0.1.0.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-router_cli-0.1.0.dist-info/entry_points.txt,sha256=PfkydZeDJvlgvEXYOG1gYvbTM39Cm-OgsPpREH3UNAU,49
-router_cli-0.1.0.dist-info/METADATA,sha256=HqMMKyryg1MFSZneA_OMyN3rR7mJ_7VBp7OCcjuKHJA,5509
-router_cli-0.1.0.dist-info/RECORD,,