WIP live dashboard continued

Author: thebentern

Meshtastic.Cli/CommandHandlers/LiveCommandHandler.cs

@@ -24,7 +24,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
     {
         var layout = new Layout("Root")
             .SplitColumns(
-                new Layout("Left"),
+                new Layout("Messages"),
                 new Layout("Right")
                     .SplitRows(
                         new Layout("Nodes"),
@@ -33,15 +33,24 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
         await AnsiConsole.Live(layout)
             .StartAsync(async ctx =>
             {
+                var printer = new ProtobufPrinter(container, OutputFormat);
+                UpdateDashboard(layout, printer);
+
                 await Connection.ReadFromRadio((fromRadio, container) =>
                 {
-                    var printer = new ProtobufPrinter(container, OutputFormat);
-                    layout["Nodes"].Update(printer.PrintNodesTable(compactTable: true));
-                    layout["Traffic"].Update(printer.PrintTrafficChart());
-                    ctx.Refresh();
+                    printer = new ProtobufPrinter(container, OutputFormat);
+                    UpdateDashboard(layout, printer);
 
+                    ctx.Refresh();
                     return Task.FromResult(false);
                 });
             });
     }
+
+    private static void UpdateDashboard(Layout layout, ProtobufPrinter printer)
+    {
+        layout["Nodes"].Update(printer.PrintNodesTable(compactTable: true));
+        layout["Traffic"].Update(printer.PrintTrafficChart());
+        layout["Messages"].Update(printer.PrintMessagesPanel());
+    }
 }

Meshtastic.Cli/Display/ProtobufPrinter.cs

@@ -8,6 +8,7 @@
 using Meshtastic.Extensions;
 using Meshtastic.Protobufs;
 using QRCoder;
+using Spectre.Console.Rendering;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Meshtastic.Display;
@@ -66,7 +67,7 @@ public Table PrintNodesTable(bool compactTable = false)
         {
             if (compactTable)
             {
-                table.AddRow(container.GetNodeDisplayName(node.Num),
+                table.AddRow(container.GetNodeDisplayName(node.Num, hideNodeNum: true),
                     (node.Position?.LatitudeI * 1e-7 ?? 0).ToString("N6") ?? String.Empty,
                     (node.Position?.LongitudeI * 1e-7 ?? 0).ToString("N6") ?? String.Empty,
                     $"{node.DeviceMetrics?.BatteryLevel}%",
@@ -318,6 +319,43 @@ public BarChart PrintTrafficChart()
             .AddItem("Telemetry", GetMessageCountByPortNum(PortNum.TelemetryApp, ignoreLocal: true), Color.Blue);
     }
 
+    public Panel PrintMessagesPanel()
+    {
+        var texts = container.FromRadioMessageLog
+            .Where(fr => fr.Packet?.Decoded?.Portnum == PortNum.TextMessageApp || fr.Packet?.Decoded?.Portnum == PortNum.TextMessageCompressedApp)
+            .Select(fr => new
+            {
+                from = $"[green bold underline]{container.GetNodeDisplayName(fr.Packet.From, hideNodeNum: true)}[/]",
+                message = fr.Packet?.Decoded?.Payload.ToStringUtf8()
+            })
+            .SelectMany(text =>
+            {
+                return new List<IRenderable>() {
+                    new Rule(text.from), 
+                    new Text(text.message!)
+                };
+            });
+
+
+        if (!texts.Any())
+        {
+            return new Panel("Messages")
+            {
+                Expand = true,
+                BorderStyle = new Style(StyleResources.MESHTASTIC_GREEN)
+            };
+        }
+
+        var messages = new Rows(texts);
+        var panel = new Panel(messages)
+        {
+            Header = new PanelHeader("Messages"),
+            Expand = true,
+            BorderStyle = new Style(StyleResources.MESHTASTIC_GREEN)
+        };
+        return panel;
+    }
+
     private int GetMessageCountByPortNum(PortNum portNum, bool ignoreLocal = false)
     {
         return container.FromRadioMessageLog.Count(fr => fr.Packet?.Decoded?.Portnum == portNum && (!ignoreLocal || fr.Packet?.From == container.MyNodeInfo.MyNodeNum));

Meshtastic/Data/DeviceStateContainer.cs

@@ -79,7 +79,7 @@ public uint GetHopLimitOrDefault()
         return (uint)(this.LocalConfig.Lora.HopLimit > 0 ? this.LocalConfig.Lora.HopLimit : 3);
     }
 
-    public string GetNodeDisplayName(uint nodeNum, bool shortName = false)
+    public string GetNodeDisplayName(uint nodeNum, bool shortName = false, bool hideNodeNum = false)
     {
         var node = this.Nodes.Find(n => n.Num == nodeNum);
         if (node == null)
@@ -88,6 +88,9 @@ public string GetNodeDisplayName(uint nodeNum, bool shortName = false)
         if (shortName)
             return node.User.ShortName;
 
+        if (hideNodeNum)
+            return $"{node.User.LongName} ({node.User.ShortName})";
+
         return $"{node.User.LongName} ({node.User.ShortName}) - {node.Num}";
     }
 }