From c9cbacb1c9ee69994e901b1f1b4f6a32b6e5f0ec Mon Sep 17 00:00:00 2001
From: Marc Hernandez <marcsh@gmail.com>
Date: Tue, 21 May 2024 22:26:54 -0700
Subject: [PATCH] x) Pass dbgExp through to the right places x) Bunch of
 logging fixes

---
 imm/Imm.cs     |  2 ++
 logging/Log.cs | 27 ++++++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/imm/Imm.cs b/imm/Imm.cs
index b16f34d..6ddfe29 100644
--- a/imm/Imm.cs
+++ b/imm/Imm.cs
@@ -262,6 +262,7 @@ public record class Recorded<T> : Versioned<T>, imm.Imm
 				DbgName = dbgName,
 				DbgPath = dbgPath,
 				DbgLine = dbgLine,
+				DbgExp  = dbgExp
 			}
 		};
 
@@ -371,6 +372,7 @@ public record class Timed<T> : Recorded<T>, imm.Imm
 				DbgName = dbgName,
 				DbgPath = dbgPath,
 				DbgLine = dbgLine,
+				DbgExp = dbgExp,
 				ZZOld = orig,
 
 				//Timed
diff --git a/logging/Log.cs b/logging/Log.cs
index c2e7e11..7045ef8 100644
--- a/logging/Log.cs
+++ b/logging/Log.cs
@@ -299,7 +299,7 @@ static public class log
 
 	static Endpoints s_endpoints = Endpoints.Console;
 	static int s_catWidth = 14;
-	static int s_timeWidth = 6;
+	static int s_timeWidth = 3;
 
 	static void startup( string filename, Endpoints endpoints )
 	{
@@ -441,7 +441,6 @@ static public class log
 		}
 	}
 
-	static private DateTime s_lastTime = DateTime.MinValue;
 	static private DateTime s_startTime = DateTime.MinValue;
 
 	static private int s_lastDisplaySeconds = -1;
@@ -451,17 +450,27 @@ static public class log
 
 	static public string msgHeader( LogEvent evt )
 	{
-		var span = evt.Time - s_startTime;
+		if( evt.LogType != LogType.Raw )
+		{
+			var span = evt.Time - s_startTime;
 
-		char sym = getSymbol( evt.LogType );
+			char sym = getSymbol( evt.LogType );
 
-		var truncatedCat = evt.Cat.Substring( 0, Math.Min( s_catWidth, evt.Cat.Length ) );
+			var truncatedCat = evt.Cat.Substring( 0, Math.Min( s_catWidth, evt.Cat.Length ) );
 
-		var time = span.Milliseconds; // humanTime( secondSpan );
+			//var time = span.Milliseconds; // humanTime( secondSpan );
 
-		var msgHdr = string.Format( $"{s_timeHeader}{{0,-{s_timeWidth}}} | {{1,-{s_catWidth}}}{{2}}| ", time, truncatedCat, sym );
+			var timeHdr = $"{s_timeHeader}{span.Seconds.ToString("D2")}.{span.Milliseconds.ToString("000")}";
+
+			var msgHdr = string.Format( $"{timeHdr} | {{0,-{s_catWidth}}}{{1}}| ", truncatedCat, sym );
+
+			return msgHdr;
+		}
+		else
+		{
+			return "";
+		}
 
-		return msgHdr;
 	}
 
 	static public string msgFrom( LogEvent evt )
@@ -501,7 +510,7 @@ static public class log
 			{
 				s_lastDisplaySeconds = curSeconds;
 
-				var minuteEvt = new LogEvent( LogType.Raw, $"T I M E ==> {evt.Time.Hour.ToString("D2")}:{evt.Time.Minute.ToString("D2")}:{evt.Time.Second.ToString("D2")}.{evt.Time.Millisecond.ToString("D4")} | {evt.Time.ToShortDateString()}", "", 0, "", "lib.time", null );
+				var minuteEvt = new LogEvent( LogType.Raw, $"T I M E ==> {evt.Time.Hour.ToString("00")}:{evt.Time.Minute.ToString("00")}:{evt.Time.Second.ToString("00")}.{evt.Time.Millisecond.ToString("000")} : {evt.Time.ToShortDateString()}", "", 0, "", "lib.time", null );
 				minuteEvt.Time = evt.Time;
 				writeSpecialEvent( minuteEvt );
 			}