Fix IPAddress/Gateway show up for wired devices (#298)

tdmgr/GUI/delegates/devices.py

@@ -344,7 +344,7 @@ def paint(self, p: QPainter, option: QStyleOptionViewItem, index):
         col_name = self.get_column_name(index)
         if col_name == "Device":
             # draw signal strength icon
-            self.draw_rssi_pixmap(index, option, p)
+            self.draw_network_pixmap(index, option, p)
 
             device_rect = option.rect.adjusted(2 * GAP + ICON_SIZE.width(), 3, 0, 0)
             p.save()
@@ -392,12 +392,15 @@ def paint(self, p: QPainter, option: QStyleOptionViewItem, index):
         else:
             QStyledItemDelegate.paint(self, p, option, index)
 
-    def draw_rssi_pixmap(self, index, option, p):
+    def draw_network_pixmap(self, index, option, p):
         p.save()
         px = self.rssi_offline
         if index.data(DeviceRoles.LWTRole):
-            rssi = index.data(DeviceRoles.RSSIRole)
-            px = get_pixmap_for_rssi(rssi)
+            if index.data(DeviceRoles.IsEthernetRole):
+                px = QPixmap(":/ethernet.png")
+            else:
+                rssi = index.data(DeviceRoles.RSSIRole)
+                px = get_pixmap_for_rssi(rssi)
 
         px_y = option.rect.y() + (option.rect.height() - ICON_SIZE.height()) // 2
         px_rect = QRect(QPoint(option.rect.x() + GAP, px_y), ICON_SIZE)

tdmgr/models/devices.py

@@ -38,7 +38,7 @@ def notify_change(self, d, key):
             [
                 key.startswith("POWER"),
                 key.startswith("FriendlyName"),
-                key in ("RSSI", "LWT", "Color", "HSBColor"),
+                key in ("RSSI", "LWT", "Color", "HSBColor", "IPAddress", "Gateway", "Ethernet"),
                 key.startswith("Channel"),
                 key.startswith("Dimmer"),
                 key.startswith("ShutterRelay"),
@@ -128,9 +128,6 @@ def data(self, idx, role=Qt.DisplayRole):
                 if col_name == "RSSI":
                     return int(d.p.get("RSSI", 0))
 
-                if col_name == "IPAddress":
-                    return d.ip_address
-
                 return val
 
             if role == DeviceRoles.LWTRole:
@@ -160,6 +157,18 @@ def data(self, idx, role=Qt.DisplayRole):
             if role == DeviceRoles.HardwareRole:
                 return getattr(d.p, "Hardware", "ESP8266")
 
+            if role == DeviceRoles.IsEthernetRole:
+                return (
+                    d.p.get("IPAddress") == "0.0.0.0"
+                    and d.p.get("Ethernet", {}).get("IPAddress") != "0.0.0.0"
+                )
+
+            if role == DeviceRoles.IPAddressRole:
+                return d.ip_address
+
+            if role == DeviceRoles.GatewayRole:
+                return d.gateway
+
             if role == Qt.TextAlignmentRole:
                 # Left-aligned columns
                 if col_name in (

tdmgr/models/roles.py

@@ -13,3 +13,7 @@ class DeviceRoles(int, Enum):
     ColorRole = auto()
     ModuleRole = auto()
     HardwareRole = auto()
+
+    IPAddressRole = auto()
+    GatewayRole = auto()
+    IsEthernetRole = auto()

tdmgr/tasmota/device.py

@@ -365,16 +365,23 @@ def color(self):
             )
         return None
 
-    @property
-    def ip_address(self) -> str:
-        for ip in [
-            self.p.get("IPAddress"),
-            self.p.get("Ethernet", {}).get("IPAddress"),
+    def _get_addr_from_wifi_or_ethernet(self, address: str) -> str:
+        for _address in [
+            self.p.get(address),
+            self.p.get("Ethernet", {}).get(address),
         ]:
-            if ip != "0.0.0.0":
-                return ip
+            if _address != "0.0.0.0":
+                return _address
         return "0.0.0.0"
 
+    @property
+    def ip_address(self) -> str:
+        return self._get_addr_from_wifi_or_ethernet("IPAddress")
+
+    @property
+    def gateway(self) -> str:
+        return self._get_addr_from_wifi_or_ethernet("Gateway")
+
     def setoption(self, o):
         if 0 <= o < 32:
             reg = 0

tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.1.json

@@ -13,7 +13,7 @@
       "Mac": "34:98:7A:68:FF:97",
       "Subnetmask": "255.255.255.0"
     },
-    "Gateway": "192.168.7.1",
+    "Gateway": "0.0.0.0",
     "HTTP_API": 1,
     "Hostname": "tasmota-68FF94-8084",
     "IP6Global": "",

tests/test_device.py

@@ -48,6 +48,22 @@ def test_ip_address(device, version, filename, expected):
     assert device.ip_address == expected
 
 
+@pytest.mark.parametrize("version", ("14.2.0.4",))
+@pytest.mark.parametrize(
+    "filename, expected",
+    [
+        ("STATUS5.json", "192.168.0.99"),
+        ("STATUS5.1.json", "192.168.7.1"),
+    ],
+)
+def test_gateway(device, version, filename, expected):
+    payload = get_payload(version, filename)
+    msg = Message("stat/topic/STATUS5", payload, prefix="stat")
+    device.process_message(msg)
+
+    assert device.gateway == expected
+
+
 @pytest.mark.parametrize(
     "fname, expected",
     [