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

Fix log filtering with IPluginLog

Browse source 
- Rename `PluginLog`'s property to `Dalamud.PluginName` to match what `IPluginLog` is doing.
- Change `ModuleLog` to use `Dalamud.ModuleName` as its context property.
- Update the Console window to handle both changes.
  - Add the ability to filter to only Dalamud module log messages.
This commit is contained in:
Kaz Wolfe 2023-09-09 15:10:52 -07:00
parent 40b875c8e9
commit 764e0a81b7
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
3 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -180,17 +180,20 @@ internal class ConsoleWindow : Window, IDisposable
}
// Filter by specific plugin(s)
var pluginInternalNames = Service<PluginManager>.Get().InstalledPlugins
var sourceNames = Service<PluginManager>.Get().InstalledPlugins
.Select(p => p.Manifest.InternalName)
.OrderBy(s => s).ToList();
.OrderBy(s => s)
.Prepend("DalamudInternal")
.ToList();
var sourcePreviewVal = this.sourceFilters.Count switch
{
0 => "All plugins...",
1 => "1 plugin...",
_ => $"{this.sourceFilters.Count} plugins...",
0 => "All sources...",
1 => "1 source...",
_ => $"{this.sourceFilters.Count} sources...",
};
var sourceSelectables = pluginInternalNames.Union(this.sourceFilters).ToList();
if (ImGui.BeginCombo("Plugins", sourcePreviewVal))
var sourceSelectables = sourceNames.Union(this.sourceFilters).ToList();
if (ImGui.BeginCombo("Sources", sourcePreviewVal))
{
foreach (var selectable in sourceSelectables)
{
@ -443,7 +446,8 @@ internal class ConsoleWindow : Window, IDisposable
// TODO: Improve this, add partial completion
// https://github.com/ocornut/imgui/blob/master/imgui_demo.cpp#L6443-L6484
var candidates = Service<CommandManager>.Get().Commands.Where(x => x.Key.Contains("/" + words[0])).ToList();
var candidates = Service<CommandManager>.Get().Commands.Where(x => x.Key.Contains("/" + words[0]))
.ToList();
if (candidates.Count > 0)
{
ptr.DeleteChars(0, ptr.BufTextLen);
@ -499,9 +503,13 @@ internal class ConsoleWindow : Window, IDisposable
TimeStamp = logEvent.Timestamp,
HasException = logEvent.Exception != null,
};
if (logEvent.Properties.TryGetValue("SourceContext", out var sourceProp) &&
sourceProp is ScalarValue { Value: string value })
if (logEvent.Properties.ContainsKey("Dalamud.ModuleName"))
{
entry.Source = "DalamudInternal";
}
else if (logEvent.Properties.TryGetValue("Dalamud.PluginName", out var sourceProp) &&
sourceProp is ScalarValue { Value: string value })
{
entry.Source = value;
}
@ -579,6 +587,10 @@ internal class ConsoleWindow : Window, IDisposable
public bool IsMultiline { get; set; }
/// <summary>
/// Gets or sets the system responsible for generating this log entry. Generally will be a plugin's
/// InternalName.
/// </summary>
public string? Source { get; set; }
public bool HasException { get; set; }