diff --git a/.editorconfig b/.editorconfig index 83e04f2..e6ffb06 100644 --- a/.editorconfig +++ b/.editorconfig @@ -57,7 +57,7 @@ dotnet_diagnostic.CA1832.severity = warning dotnet_diagnostic.CA1833.severity = warning dotnet_diagnostic.CA1842.severity = warning dotnet_diagnostic.CA1843.severity = warning -dotnet_diagnostic.CA1836.severity = warning +dotnet_diagnostic.CA1836.severity = none dotnet_diagnostic.CA1839.severity = warning dotnet_diagnostic.CA1840.severity = warning dotnet_diagnostic.CA1846.severity = warning @@ -1168,7 +1168,7 @@ resharper_arrange_default_value_when_type_evident_highlighting = suggestion resharper_arrange_default_value_when_type_not_evident_highlighting = suggestion resharper_arrange_local_function_body_highlighting = error resharper_arrange_method_or_operator_body_highlighting = error -resharper_arrange_missing_parentheses_highlighting = hint +resharper_arrange_missing_parentheses_highlighting = none resharper_arrange_namespace_body_highlighting = error resharper_arrange_object_creation_when_type_evident_highlighting = suggestion resharper_arrange_object_creation_when_type_not_evident_highlighting = suggestion diff --git a/EllieHub/EllieHub.csproj b/EllieHub/EllieHub.csproj index ce62d5e..1104402 100644 --- a/EllieHub/EllieHub.csproj +++ b/EllieHub/EllieHub.csproj @@ -12,7 +12,6 @@ True True Assets/Light/ellieupdatericon.ico - CA1836 true diff --git a/EllieHub/Features/BotConfig/Services/LogWriter.cs b/EllieHub/Features/BotConfig/Services/LogWriter.cs index f2e3049..8361d47 100644 --- a/EllieHub/Features/BotConfig/Services/LogWriter.cs +++ b/EllieHub/Features/BotConfig/Services/LogWriter.cs @@ -11,7 +11,7 @@ namespace EllieHub.Features.BotConfig.Services; /// public sealed class LogWriter : ILogWriter { - private readonly Dictionary _botLogs = new(); + private readonly Dictionary _botLogs = []; private readonly ReadOnlyAppSettings _appConfig; /// @@ -48,7 +48,7 @@ public sealed class LogWriter : ILogWriter var botEntry = _appConfig.BotEntries[botId]; var now = DateTimeOffset.Now; var date = new DateOnly(now.Year, now.Month, now.Day).ToShortDateString().Replace('/', '-'); - var fileUri = Path.Combine(_appConfig.LogsDirectoryUri, $"{botEntry.Name}_v{botEntry.Version}_{date}-{now.ToUnixTimeSeconds()}.txt"); + var fileUri = Path.Join(_appConfig.LogsDirectoryUri, $"{botEntry.Name}_v{botEntry.Version}_{date}-{now.ToUnixTimeSeconds()}.txt"); await File.WriteAllTextAsync(fileUri, logStringBuilder.ToString(), cToken); diff --git a/EllieHub/Features/BotConfig/ViewModels/BotConfigViewModel.cs b/EllieHub/Features/BotConfig/ViewModels/BotConfigViewModel.cs index b43f375..32baf83 100644 --- a/EllieHub/Features/BotConfig/ViewModels/BotConfigViewModel.cs +++ b/EllieHub/Features/BotConfig/ViewModels/BotConfigViewModel.cs @@ -506,6 +506,12 @@ public class BotConfigViewModel : ViewModelBase, IDisposable /// public void Dispose() { + UpdateBar.Click -= InstallOrUpdateAsync; + _botOrchestrator.OnStdout -= WriteLog; + _botOrchestrator.OnStderr -= WriteLog; + _botOrchestrator.OnBotExit -= LogBotExit; + _botOrchestrator.OnBotExit -= ReenableButtonsOnBotExit; + BotAvatar.Dispose(); GC.SuppressFinalize(this); }