From ffe969f77cc0971429d1ddb7f12371bbfe6359f6 Mon Sep 17 00:00:00 2001 From: Geoff Whittington Date: Sat, 10 Jun 2023 13:41:33 -0400 Subject: [PATCH] Fix nodes issue when metrics are missing --- plugins/nodes_plugin.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py index a13b1dd..97f9fef 100644 --- 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