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

remove unprocessed profile commands when another one is queued

Browse source
This commit is contained in:
goat 2023-04-10 23:11:37 +02:00
parent ffb0a0c41d
commit 92f638d114
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Dalamud/Plugin/Internal/Profiles/ProfileCommandHandler.cs
View file

@ -12,6 +12,9 @@ using Serilog;
namespace Dalamud.Plugin.Internal.Profiles; namespace Dalamud.Plugin.Internal.Profiles;
/// <summary>
/// Service responsible for profile-related chat commands.
/// </summary>
[ServiceManager.EarlyLoadedService] [ServiceManager.EarlyLoadedService]
internal class ProfileCommandHandler : IServiceType, IDisposable internal class ProfileCommandHandler : IServiceType, IDisposable
{ {
@ -20,12 +23,15 @@ internal class ProfileCommandHandler : IServiceType, IDisposable
private readonly ChatGui chat; private readonly ChatGui chat;
private readonly Framework framework; private readonly Framework framework;
private Queue<(string, ProfileOp)> queue = new(); private List<(string, ProfileOp)> queue = new();
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ProfileCommandHandler"/> class. /// Initializes a new instance of the <see cref="ProfileCommandHandler"/> class.
/// </summary> /// </summary>
/// <param name="cmd"></param> /// <param name="cmd">Command handler.</param>
/// <param name="profileManager">Profile manager.</param>
/// <param name="chat">Chat handler.</param>
/// <param name="framework">Framework.</param>
[ServiceManager.ServiceConstructor] [ServiceManager.ServiceConstructor]
public ProfileCommandHandler(CommandManager cmd, ProfileManager profileManager, ChatGui chat, Framework framework) public ProfileCommandHandler(CommandManager cmd, ProfileManager profileManager, ChatGui chat, Framework framework)
{ {
@ -36,32 +42,45 @@ internal class ProfileCommandHandler : IServiceType, IDisposable
this.cmd.AddHandler("/xlenableprofile", new CommandInfo(this.OnEnableProfile) this.cmd.AddHandler("/xlenableprofile", new CommandInfo(this.OnEnableProfile)
{ {
HelpMessage = "", HelpMessage = Loc.Localize("ProfileCommandsEnableHint", "Enable a profile. Usage: /xlenableprofile \"Profile Name\""),
ShowInHelp = true, ShowInHelp = true,
}); });
this.cmd.AddHandler("/xldisableprofile", new CommandInfo(this.OnDisableProfile) this.cmd.AddHandler("/xldisableprofile", new CommandInfo(this.OnDisableProfile)
{ {
HelpMessage = "", HelpMessage = Loc.Localize("ProfileCommandsDisableHint", "Disable a profile. Usage: /xldisableprofile \"Profile Name\""),
ShowInHelp = true, ShowInHelp = true,
}); });
this.cmd.AddHandler("/xltoggleprofile", new CommandInfo(this.OnToggleProfile) this.cmd.AddHandler("/xltoggleprofile", new CommandInfo(this.OnToggleProfile)
{ {
HelpMessage = "", HelpMessage = Loc.Localize("ProfileCommandsToggleHint", "Toggle a profile. Usage: /xltoggleprofile \"Profile Name\""),
ShowInHelp = true, ShowInHelp = true,
}); });
this.framework.Update += this.FrameworkOnUpdate; this.framework.Update += this.FrameworkOnUpdate;
} }
/// <inheritdoc/>
public void Dispose()
{
this.cmd.RemoveHandler("/xlenableprofile");
this.cmd.RemoveHandler("/xldisableprofile");
this.cmd.RemoveHandler("/xltoggleprofile");
this.framework.Update += this.FrameworkOnUpdate;
}
private void FrameworkOnUpdate(Framework framework1) private void FrameworkOnUpdate(Framework framework1)
{ {
if (this.profileManager.IsBusy) if (this.profileManager.IsBusy)
return; return;
if (this.queue.TryDequeue(out var op)) if (this.queue.Count > 0)
{ {
var op = this.queue[0];
this.queue.RemoveAt(0);
var profile = this.profileManager.Profiles.FirstOrDefault(x => x.Name == op.Item1); var profile = this.profileManager.Profiles.FirstOrDefault(x => x.Name == op.Item1);
if (profile == null || profile.IsDefaultProfile) if (profile == null || profile.IsDefaultProfile)
return; return;
@ -107,22 +126,14 @@ internal class ProfileCommandHandler : IServiceType, IDisposable
} }
} }
public void Dispose()
{
this.cmd.RemoveHandler("/xlenableprofile");
this.cmd.RemoveHandler("/xldisableprofile");
this.cmd.RemoveHandler("/xltoggleprofile");
this.framework.Update += this.FrameworkOnUpdate;
}
private void OnEnableProfile(string command, string arguments) private void OnEnableProfile(string command, string arguments)
{ {
var name = this.ValidateName(arguments); var name = this.ValidateName(arguments);
if (name == null) if (name == null)
return; return;
this.queue.Enqueue((name, ProfileOp.Enable)); this.queue = this.queue.Where(x => x.Item1 != name).ToList();
this.queue.Add((name, ProfileOp.Enable));
} }
private void OnDisableProfile(string command, string arguments) private void OnDisableProfile(string command, string arguments)
@ -131,7 +142,8 @@ internal class ProfileCommandHandler : IServiceType, IDisposable
if (name == null) if (name == null)
return; return;
this.queue.Enqueue((name, ProfileOp.Disable)); this.queue = this.queue.Where(x => x.Item1 != name).ToList();
this.queue.Add((name, ProfileOp.Disable));
} }
private void OnToggleProfile(string command, string arguments) private void OnToggleProfile(string command, string arguments)
@ -140,7 +152,7 @@ internal class ProfileCommandHandler : IServiceType, IDisposable
if (name == null) if (name == null)
return; return;
this.queue.Enqueue((name, ProfileOp.Toggle)); this.queue.Add((name, ProfileOp.Toggle));
} }
private string? ValidateName(string arguments) private string? ValidateName(string arguments)