fix second core dump on export option
This commit is contained in:
Binary file not shown.
@@ -64,20 +64,22 @@ public sealed class LogPanel
|
|||||||
foreach (var entry in snapshot)
|
foreach (var entry in snapshot)
|
||||||
{
|
{
|
||||||
var timeStr = entry.Time.ToString("HH:mm:ss");
|
var timeStr = entry.Time.ToString("HH:mm:ss");
|
||||||
var (tag, color) = entry.Level switch
|
var (tagLabel, color) = entry.Level switch
|
||||||
{
|
{
|
||||||
LogLevel.Sql => ("[SQL ]", "blue"),
|
LogLevel.Sql => ("SQL ", "blue"),
|
||||||
LogLevel.Done => ("[DONE]", "green"),
|
LogLevel.Done => ("DONE", "green"),
|
||||||
LogLevel.Warn => ("[WARN]", "yellow"),
|
LogLevel.Warn => ("WARN", "yellow"),
|
||||||
LogLevel.Error => ("[ERR ]", "red"),
|
LogLevel.Error => ("ERR ", "red"),
|
||||||
_ => ("[INFO]", "grey"),
|
_ => ("INFO", "grey"),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Escape any markup-like content in the raw text
|
// Strip the leading [TAG] prefix from the raw text if present,
|
||||||
var safeText = Markup.Escape(entry.Text);
|
// since we re-render it with color. Then escape the remainder.
|
||||||
|
var rawText = StripKnownPrefix(entry.Text);
|
||||||
|
var safeText = Markup.Escape(rawText);
|
||||||
|
|
||||||
rows.AddRow(new Markup(
|
rows.AddRow(new Markup(
|
||||||
$"[dim]{timeStr}[/] [{color}]{tag}[/] {safeText}"));
|
$"[dim]{timeStr}[/] [{color}][[{tagLabel}]][/] {safeText}"));
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Panel(rows)
|
return new Panel(rows)
|
||||||
@@ -96,8 +98,21 @@ public sealed class LogPanel
|
|||||||
return LogLevel.Done;
|
return LogLevel.Done;
|
||||||
if (text.Contains("[WARN]"))
|
if (text.Contains("[WARN]"))
|
||||||
return LogLevel.Warn;
|
return LogLevel.Warn;
|
||||||
if (text.Contains("[ERROR]") || text.Contains("[ERR]"))
|
if (text.Contains("[ERROR]") || text.Contains("[ERR]") || text.Contains("[ERR ]"))
|
||||||
return LogLevel.Error;
|
return LogLevel.Error;
|
||||||
return LogLevel.Info;
|
return LogLevel.Info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static readonly string[] KnownPrefixes =
|
||||||
|
["[INFO] ", "[SQL ] ", "[SQL] ", "[DONE] ", "[WARN] ", "[ERROR] ", "[ERR ] ", "[ERR] "];
|
||||||
|
|
||||||
|
private static string StripKnownPrefix(string text)
|
||||||
|
{
|
||||||
|
foreach (var prefix in KnownPrefixes)
|
||||||
|
{
|
||||||
|
if (text.StartsWith(prefix, StringComparison.Ordinal))
|
||||||
|
return text[prefix.Length..];
|
||||||
|
}
|
||||||
|
return text;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user