Added IDisposable to a few components to prevent leaks and added additional failure logging

Author: jschick04

src/EventLogExpert/Components/DetailsPane.razor.cs

@@ -10,11 +10,12 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
+using Microsoft.Extensions.Logging;
 using System.Collections.Immutable;
 
 namespace EventLogExpert.Components;
 
-public sealed partial class DetailsPane
+public sealed partial class DetailsPane : IDisposable
 {
     private bool _hasOpened = false;
     private bool _isVisible = false;
@@ -32,6 +33,10 @@ public sealed partial class DetailsPane
 
     [Inject] private ISettingsService Settings { get; init; } = null!;
 
+    [Inject] private IFileLogger TraceLogger { get; init; } = null!;
+
+    public void Dispose() => SelectedEventSelection.SelectedValueChanged -= OnSelectedEventChanged;
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
@@ -46,18 +51,7 @@ protected override void OnInitialized()
     {
         SelectedEventSelection.Select(s => s.SelectedEvents);
 
-        SelectedEventSelection.SelectedValueChanged += async (s, selectedEvents) =>
-        {
-            SelectedEvent = selectedEvents.LastOrDefault();
-
-            if (SelectedEvent is null) { return; }
-
-            await SelectedEvent.ResolveXml();
-
-            if (!_hasOpened || Settings.ShowDisplayPaneOnSelectionChange) { _isVisible = true; }
-
-            StateHasChanged();
-        };
+        SelectedEventSelection.SelectedValueChanged += OnSelectedEventChanged;
 
         base.OnInitialized();
     }
@@ -80,6 +74,26 @@ private void HandleKeyDownXml(KeyboardEventArgs e)
         }
     }
 
+    private async void OnSelectedEventChanged(object? sender, ImmutableList<DisplayEventModel> selectedEvents)
+    {
+        try
+        {
+            SelectedEvent = selectedEvents.LastOrDefault();
+
+            if (SelectedEvent is null) { return; }
+
+            await SelectedEvent.ResolveXml();
+
+            if (!_hasOpened || Settings.ShowDisplayPaneOnSelectionChange) { _isVisible = true; }
+
+            await InvokeAsync(StateHasChanged);
+        }
+        catch (Exception e)
+        {
+            TraceLogger.Trace($"Failed to handle selected event change: {e}", LogLevel.Error);
+        }
+    }
+
     private void ToggleMenu()
     {
         if (!_hasOpened) { _hasOpened = true; }

src/EventLogExpert/Components/FilterPane.razor.cs

@@ -14,7 +14,7 @@
 
 namespace EventLogExpert.Components;
 
-public sealed partial class FilterPane
+public sealed partial class FilterPane : IDisposable
 {
     private readonly FilterDateModel _model = new();
 
@@ -36,6 +36,8 @@ public sealed partial class FilterPane
 
     [Inject] private ISettingsService Settings { get; init; } = null!;
 
+    public void Dispose() => Settings.TimeZoneChanged -= UpdateFilterDateTimeZone;
+
     protected override void OnInitialized()
     {
         SubscribeToAction<FilterPaneAction.ClearAllFilters>(action => { _canEditDate = false; });

src/EventLogExpert/MainPage.xaml.cs

@@ -116,6 +116,8 @@ await MainThread.InvokeOnMainThreadAsync(() =>
 
     public void Dispose()
     {
+        _settings.CopyTypeChanged -= SetCopyKeyboardAccelerator;
+
         _cancellationTokenSource.Cancel();
         _cancellationTokenSource.Dispose();
     }
@@ -447,7 +449,7 @@ private async Task ProcessCommandLine()
             {
                 switch (arg)
                 {
-                    case not null when arg.EndsWith(".evtx"):
+                    case not null when arg.EndsWith(".evtx", StringComparison.OrdinalIgnoreCase):
                         await OpenLog(arg, PathType.FilePath);
                         break;
                 }

src/EventLogExpert/Shared/Components/DebugLogModal.razor.cs

@@ -7,12 +7,18 @@
 
 namespace EventLogExpert.Shared.Components;
 
-public partial class DebugLogModal
+public partial class DebugLogModal : IDisposable
 {
     private readonly List<string> _data = [];
 
     [Inject] private IFileLogger TraceLogger { get; set; } = null!;
 
+    public void Dispose()
+    {
+        TraceLogger.DebugLogLoaded -= OnDebugLogLoaded;
+        GC.SuppressFinalize(this);
+    }
+
     protected internal override async Task Open()
     {
         await Refresh();

src/EventLogExpert/Shared/Components/Filters/FilterGroup.razor.cs

@@ -25,10 +25,10 @@ public sealed partial class FilterGroup
 
     private void AddFilter() => Dispatcher.Dispatch(new FilterGroupAction.AddFilter(Group.Id));
 
-    private void ApplyFilters()
+    private async Task ApplyFilters()
     {
         Dispatcher.Dispatch(new FilterPaneAction.ApplyFilterGroup(Group));
-        InvokeAsync(Parent.Close);
+        await InvokeAsync(Parent.Close);
     }
 
     private void CopyGroup() => Clipboard.SetTextAsync(Group.Filters.Count > 1 ?

src/EventLogExpert/Shared/Components/SettingsModal.razor.cs

@@ -14,7 +14,7 @@
 
 namespace EventLogExpert.Shared.Components;
 
-public sealed partial class SettingsModal
+public sealed partial class SettingsModal : IDisposable
 {
     private readonly List<(string name, bool isEnabled, bool hasChanged)> _databases = [];
 
@@ -40,6 +40,8 @@ public sealed partial class SettingsModal
 
     [Inject] private IFileLogger TraceLogger { get; init; } = null!;
 
+    public void Dispose() => Settings.Loaded -= OnSettingsLoaded;
+
     protected internal override async Task Close()
     {
         if (_databaseRemoved)
@@ -84,22 +86,32 @@ private async Task ImportDatabase()
 
             Directory.CreateDirectory(FileLocationOptions.DatabasePath);
 
+            List<string> importedFiles = [];
+
             foreach (var item in result)
             {
-                if (item?.FileName is null) { continue; }
+                if (string.IsNullOrEmpty(item?.FileName) || string.IsNullOrEmpty(item.FullPath)) { continue; }
 
                 var destination = Path.Join(FileLocationOptions.DatabasePath, item.FileName);
                 File.Copy(item.FullPath, destination, true);
 
-                if (Path.GetExtension(destination) != ".zip") { continue; }
+                importedFiles.Add(item.FileName);
+
+                if (!Path.GetExtension(destination).Equals(".zip", StringComparison.OrdinalIgnoreCase)) { continue; }
 
                 await ZipFile.ExtractToDirectoryAsync(destination, FileLocationOptions.DatabasePath, overwriteFiles: true);
                 File.Delete(destination);
             }
 
-            var message = result.Length > 1 ?
-                $"{result.Length} databases have successfully been imported" :
-                $"{result[0]?.FileName ?? "Database"} has successfully been imported";
+            if (importedFiles.Count == 0)
+            {
+                await AlertDialogService.ShowAlert("Import Failed", "No valid database files were selected.", "OK");
+                return;
+            }
+
+            var message = importedFiles.Count > 1 ?
+                $"{importedFiles.Count} databases have successfully been imported" :
+                $"{importedFiles[0]} has successfully been imported";
 
             await AlertDialogService.ShowAlert("Import Successful", message, "OK");