contest: hw: mctrl: support displaying timestamps

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Author: kuba-moo

contest/hw/mc_cli.py

@@ -90,15 +90,22 @@ def cmd_resolve(args, mc):
 def cmd_sol(args, mc):
     """Fetch SOL logs."""
     color = args.color
+    show_ts = args.timestamps
+
+    def _fmt(entry):
+        line = _sanitize(entry['line'], keep_color=color)
+        if show_ts:
+            return f"{entry.get('ts', '')}  {line}"
+        return line
+
     if args.follow:
         # Fetch last lines to start, then poll for new ones
         tail_n = args.tail or 10
         data = mc.get_sol_logs(args.machine_id, start_id=args.start_id,
                                limit=tail_n, sort='desc')
         lines = list(reversed(data.get('lines', [])))
         for entry in lines:
-            ts = entry.get('ts', '')
-            print(f"{ts}  {_sanitize(entry['line'], keep_color=color)}", end='')
+            print(_fmt(entry), end='')
         last_id = data.get('last_id', 0)
 
         import time
@@ -108,9 +115,7 @@ def cmd_sol(args, mc):
                 data = mc.get_sol_logs(args.machine_id, start_id=last_id,
                                        limit=args.limit)
                 for entry in data.get('lines', []):
-                    ts = entry.get('ts', '')
-                    print(f"{ts}  {_sanitize(entry['line'], keep_color=color)}",
-                          end='', flush=True)
+                    print(_fmt(entry), end='', flush=True)
                 last_id = data.get('last_id', last_id)
         except KeyboardInterrupt:
             return 0
@@ -122,8 +127,7 @@ def cmd_sol(args, mc):
             return 0
         lines = list(reversed(data.get('lines', [])))
         for entry in lines:
-            ts = entry.get('ts', '')
-            print(f"{ts}  {_sanitize(entry['line'], keep_color=color)}", end='')
+            print(_fmt(entry), end='')
         last_id = data.get('last_id', 0)
         print(f"last_id={last_id}", file=sys.stderr)
         return 0
@@ -134,8 +138,7 @@ def cmd_sol(args, mc):
         print(json.dumps(data, indent=2))
         return 0
     for entry in data.get('lines', []):
-        ts = entry.get('ts', '')
-        print(f"{ts}  {_sanitize(entry['line'], keep_color=color)}", end='')
+        print(_fmt(entry), end='')
     last_id = data.get('last_id', 0)
     print(f"last_id={last_id}", file=sys.stderr)
     return 0
@@ -256,6 +259,8 @@ def main(argv=None):
                        help='show last N lines (like tail -N)')
     p_sol.add_argument('--color', action='store_true',
                        help='preserve ANSI color/formatting in output')
+    p_sol.add_argument('-t', '--timestamps', action='store_true',
+                       help='show timestamp for each line')
 
     p_reserve = sub.add_parser('reserve', help='reserve machines')
     p_reserve.add_argument('--machine-ids', required=True,