Fix nodes issue when metrics are missing

geoffwhittington · Jun 10, 2023 · ffe969f · ffe969f
1 parent ed9f3a7
commit ffe969f
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py
@@ -54,14 +54,15 @@ def generate_response(self):
                 snr = f"{info['snr']} dB"
             else:
                 snr = ""
-            if "voltage" in info["deviceMetrics"]:
-                voltage = f"{info['deviceMetrics']['voltage']}V"
-            else:
-                voltage = "?V"
-            if "batteryLevel" in info["deviceMetrics"]:
-                battery = f"{info['deviceMetrics']['batteryLevel']}%"
-            else:
-                battery = "?%"
+
+            voltage = "?V"
+            battery = "?%"
+            if "deviceMetrics" in info:
+                if "voltage" in info["deviceMetrics"]:
+                    voltage = f"{info['deviceMetrics']['voltage']}V"
+                if "batteryLevel" in info["deviceMetrics"]:
+                    battery = f"{info['deviceMetrics']['batteryLevel']}%"
+
             response += f"{info['user']['shortName']} {info['user']['longName']} / {info['user']['hwModel']} / {battery} {voltage} / {snr} / {get_relative_time(info['lastHeard'])}\n"
 
         return response