ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-02 13:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

console: persist log command buffer in config

Browse source
This commit is contained in:
goat 2024-06-09 21:42:30 +02:00
parent 2d5c4ed7dc
commit 1133fcfb9d
1 changed files with 33 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

69
Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
View file

@ -38,6 +38,7 @@ internal class ConsoleWindow : Window, IDisposable
{ {
private const int LogLinesMinimum = 100; private const int LogLinesMinimum = 100;
private const int LogLinesMaximum = 1000000; private const int LogLinesMaximum = 1000000;
private const int HistorySize = 50;
// Only this field may be touched from any thread. // Only this field may be touched from any thread.
private readonly ConcurrentQueue<(string Line, LogEvent LogEvent)> newLogEntries; private readonly ConcurrentQueue<(string Line, LogEvent LogEvent)> newLogEntries;
@ -45,9 +46,10 @@ internal class ConsoleWindow : Window, IDisposable
// Fields below should be touched only from the main thread. // Fields below should be touched only from the main thread.
private readonly RollingList<LogEntry> logText; private readonly RollingList<LogEntry> logText;
private readonly RollingList<LogEntry> filteredLogEntries; private readonly RollingList<LogEntry> filteredLogEntries;
private readonly List<string> history = new();
private readonly List<PluginFilterEntry> pluginFilters = new(); private readonly List<PluginFilterEntry> pluginFilters = new();
private readonly DalamudConfiguration configuration;
private int newRolledLines; private int newRolledLines;
private bool pendingRefilter; private bool pendingRefilter;
@ -89,6 +91,8 @@ internal class ConsoleWindow : Window, IDisposable
public ConsoleWindow(DalamudConfiguration configuration) public ConsoleWindow(DalamudConfiguration configuration)
: base("Dalamud Console", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse) : base("Dalamud Console", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
{ {
this.configuration = configuration;
this.autoScroll = configuration.LogAutoScroll; this.autoScroll = configuration.LogAutoScroll;
this.autoOpen = configuration.LogOpenAtStartup; this.autoOpen = configuration.LogOpenAtStartup;
SerilogEventSink.Instance.LogLine += this.OnLogLine; SerilogEventSink.Instance.LogLine += this.OnLogLine;
@ -115,7 +119,7 @@ internal class ConsoleWindow : Window, IDisposable
this.logText = new(limit); this.logText = new(limit);
this.filteredLogEntries = new(limit); this.filteredLogEntries = new(limit);
configuration.DalamudConfigurationSaved += this.OnDalamudConfigurationSaved; this.configuration.DalamudConfigurationSaved += this.OnDalamudConfigurationSaved;
unsafe unsafe
{ {
@ -134,7 +138,7 @@ internal class ConsoleWindow : Window, IDisposable
public void Dispose() public void Dispose()
{ {
SerilogEventSink.Instance.LogLine -= this.OnLogLine; SerilogEventSink.Instance.LogLine -= this.OnLogLine;
Service<DalamudConfiguration>.Get().DalamudConfigurationSaved -= this.OnDalamudConfigurationSaved; this.configuration.DalamudConfigurationSaved -= this.OnDalamudConfigurationSaved;
if (Service<Framework>.GetNullable() is { } framework) if (Service<Framework>.GetNullable() is { } framework)
framework.Update -= this.FrameworkOnUpdate; framework.Update -= this.FrameworkOnUpdate;
@ -465,8 +469,6 @@ internal class ConsoleWindow : Window, IDisposable
private void DrawOptionsToolbar() private void DrawOptionsToolbar()
{ {
var configuration = Service<DalamudConfiguration>.Get();
ImGui.PushItemWidth(150.0f * ImGuiHelpers.GlobalScale); ImGui.PushItemWidth(150.0f * ImGuiHelpers.GlobalScale);
if (ImGui.BeginCombo("##log_level", $"{EntryPoint.LogLevelSwitch.MinimumLevel}+")) if (ImGui.BeginCombo("##log_level", $"{EntryPoint.LogLevelSwitch.MinimumLevel}+"))
{ {
@ -475,8 +477,8 @@ internal class ConsoleWindow : Window, IDisposable
if (ImGui.Selectable(value.ToString(), value == EntryPoint.LogLevelSwitch.MinimumLevel)) if (ImGui.Selectable(value.ToString(), value == EntryPoint.LogLevelSwitch.MinimumLevel))
{ {
EntryPoint.LogLevelSwitch.MinimumLevel = value; EntryPoint.LogLevelSwitch.MinimumLevel = value;
configuration.LogLevel = value; this.configuration.LogLevel = value;
configuration.QueueSave(); this.configuration.QueueSave();
this.QueueRefilter(); this.QueueRefilter();
} }
} }
@ -489,13 +491,13 @@ internal class ConsoleWindow : Window, IDisposable
var settingsPopup = ImGui.BeginPopup("##console_settings"); var settingsPopup = ImGui.BeginPopup("##console_settings");
if (settingsPopup) if (settingsPopup)
{ {
this.DrawSettingsPopup(configuration); this.DrawSettingsPopup();
ImGui.EndPopup(); ImGui.EndPopup();
} }
else if (this.settingsPopupWasOpen) else if (this.settingsPopupWasOpen)
{ {
// Prevent side effects in case Apply wasn't clicked // Prevent side effects in case Apply wasn't clicked
this.logLinesLimit = configuration.LogLinesLimit; this.logLinesLimit = this.configuration.LogLinesLimit;
} }
this.settingsPopupWasOpen = settingsPopup; this.settingsPopupWasOpen = settingsPopup;
@ -643,18 +645,18 @@ internal class ConsoleWindow : Window, IDisposable
} }
} }
private void DrawSettingsPopup(DalamudConfiguration configuration) private void DrawSettingsPopup()
{ {
if (ImGui.Checkbox("Open at startup", ref this.autoOpen)) if (ImGui.Checkbox("Open at startup", ref this.autoOpen))
{ {
configuration.LogOpenAtStartup = this.autoOpen; this.configuration.LogOpenAtStartup = this.autoOpen;
configuration.QueueSave(); this.configuration.QueueSave();
} }
if (ImGui.Checkbox("Auto-scroll", ref this.autoScroll)) if (ImGui.Checkbox("Auto-scroll", ref this.autoScroll))
{ {
configuration.LogAutoScroll = this.autoScroll; this.configuration.LogAutoScroll = this.autoScroll;
configuration.QueueSave(); this.configuration.QueueSave();
} }
ImGui.TextUnformatted("Logs buffer"); ImGui.TextUnformatted("Logs buffer");
@ -663,8 +665,8 @@ internal class ConsoleWindow : Window, IDisposable
{ {
this.logLinesLimit = Math.Max(LogLinesMinimum, this.logLinesLimit); this.logLinesLimit = Math.Max(LogLinesMinimum, this.logLinesLimit);
configuration.LogLinesLimit = this.logLinesLimit; this.configuration.LogLinesLimit = this.logLinesLimit;
configuration.QueueSave(); this.configuration.QueueSave();
ImGui.CloseCurrentPopup(); ImGui.CloseCurrentPopup();
} }
@ -800,23 +802,18 @@ internal class ConsoleWindow : Window, IDisposable
{ {
try try
{ {
this.historyPos = -1; if (string.IsNullOrEmpty(this.commandText))
for (var i = this.history.Count - 1; i >= 0; i--)
{
if (this.history[i] == this.commandText)
{
this.history.RemoveAt(i);
break;
}
}
this.history.Add(this.commandText);
if (this.commandText is "clear" or "cls")
{
this.QueueClear();
return; return;
}
this.historyPos = -1;
if (this.commandText != this.configuration.LogCommandHistory.LastOrDefault())
this.configuration.LogCommandHistory.Add(this.commandText);
if (this.configuration.LogCommandHistory.Count > HistorySize)
this.configuration.LogCommandHistory.RemoveAt(0);
this.configuration.QueueSave();
this.lastCmdSuccess = Service<ConsoleManager>.Get().ProcessCommand(this.commandText); this.lastCmdSuccess = Service<ConsoleManager>.Get().ProcessCommand(this.commandText);
this.commandText = string.Empty; this.commandText = string.Empty;
@ -902,7 +899,7 @@ internal class ConsoleWindow : Window, IDisposable
if (ptr.EventKey == ImGuiKey.UpArrow) if (ptr.EventKey == ImGuiKey.UpArrow)
{ {
if (this.historyPos == -1) if (this.historyPos == -1)
this.historyPos = this.history.Count - 1; this.historyPos = this.configuration.LogCommandHistory.Count - 1;
else if (this.historyPos > 0) else if (this.historyPos > 0)
this.historyPos--; this.historyPos--;
} }
@ -910,7 +907,7 @@ internal class ConsoleWindow : Window, IDisposable
{ {
if (this.historyPos != -1) if (this.historyPos != -1)
{ {
if (++this.historyPos >= this.history.Count) if (++this.historyPos >= this.configuration.LogCommandHistory.Count)
{ {
this.historyPos = -1; this.historyPos = -1;
} }
@ -919,7 +916,7 @@ internal class ConsoleWindow : Window, IDisposable
if (prevPos != this.historyPos) if (prevPos != this.historyPos)
{ {
var historyStr = this.historyPos >= 0 ? this.history[this.historyPos] : string.Empty; var historyStr = this.historyPos >= 0 ? this.configuration.LogCommandHistory[this.historyPos] : string.Empty;
ptr.DeleteChars(0, ptr.BufTextLen); ptr.DeleteChars(0, ptr.BufTextLen);
ptr.InsertChars(0, historyStr); ptr.InsertChars(0, historyStr);