Use hashset and dictionary

Nexus-Mods · Sep 12, 2024 · 9fbae51 · 9fbae51
1 parent 6176e03
commit 9fbae51
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/src/NexusMods.App.UI/Extensions/R3Extensions.cs b/src/NexusMods.App.UI/Extensions/R3Extensions.cs
@@ -150,4 +150,29 @@ public static void ApplyChanges<TKey, TValue>(this ObservableList<TValue> list,
             }
         }
     }
+
+    public static void ApplyChanges<TKey, TValue>(this ObservableHashSet<TValue> set, IChangeSet<TValue, TKey> changes)
+        where TValue : notnull
+        where TKey : notnull
+    {
+        foreach (var change in changes)
+        {
+            switch (change.Reason)
+            {
+                case ChangeReason.Add:
+                    set.Add(change.Current);
+                    break;
+                case ChangeReason.Remove:
+                    set.Remove(change.Current);
+                    break;
+                case ChangeReason.Update:
+                    if (set.Remove(change.Previous.Value))
+                    {
+                        set.Add(change.Current);
+                    }
+
+                    break;
+            }
+        }
+    }
 }
diff --git a/src/NexusMods.App.UI/Pages/LibraryPage/FakeParentLibraryItemModel.cs b/src/NexusMods.App.UI/Pages/LibraryPage/FakeParentLibraryItemModel.cs
@@ -12,7 +12,7 @@ public class FakeParentLibraryItemModel : LibraryItemModel
 {
     public required IObservable<int> NumInstalledObservable { get; init; }
     public required IObservable<IChangeSet<LibraryItem.ReadOnly, EntityId>> LibraryItemsObservable { get; init; }
-    protected ObservableList<LibraryItem.ReadOnly> LibraryItems { get; set; } = [];
+    protected ObservableHashSet<LibraryItem.ReadOnly> LibraryItems { get; set; } = [];
 
     public override IReadOnlyCollection<LibraryItemId> GetLoadoutItemIds() => LibraryItems.Select(static item => item.LibraryItemId).ToArray();
 

diff --git a/src/NexusMods.App.UI/Pages/LibraryPage/LibraryItemModel.cs b/src/NexusMods.App.UI/Pages/LibraryPage/LibraryItemModel.cs
@@ -25,7 +25,7 @@ public class LibraryItemModel : TreeDataGridItemModel<LibraryItemModel, EntityId
     public BindableReactiveProperty<string> Version { get; set; } = new("-");
 
     public IObservable<IChangeSet<LibraryLinkedLoadoutItem.ReadOnly, EntityId>> LinkedLoadoutItemsObservable { get; init; } = System.Reactive.Linq.Observable.Empty<IChangeSet<LibraryLinkedLoadoutItem.ReadOnly, EntityId>>();
-    private ObservableList<LibraryLinkedLoadoutItem.ReadOnly> LinkedLoadoutItems { get; set; } = [];
+    private ObservableDictionary<EntityId, LibraryLinkedLoadoutItem.ReadOnly> LinkedLoadoutItems { get; set; } = [];
 
     public ReactiveProperty<DateTime> InstalledDate { get; } = new(DateTime.UnixEpoch);
     public ReactiveProperty<DateTime> CreatedAtDate { get; } = new(DateTime.UnixEpoch);
@@ -78,7 +78,7 @@ public LibraryItemModel(LibraryItemId libraryItemId)
                     {
                         model.InstallText.Value = "Installed";
                         model.IsInstalledInLoadout.Value = true;
-                        model.InstalledDate.Value = model.LinkedLoadoutItems.Select(static item => item.GetCreatedAt()).Max();
+                        model.InstalledDate.Value = model.LinkedLoadoutItems.Select(static kv => kv.Value.GetCreatedAt()).Max();
                         model.FormattedInstalledDate.Value = FormatDate(DateTime.Now, model.InstalledDate.Value);
                     }
                     else

diff --git a/src/NexusMods.App.UI/Pages/LoadoutPage/FakeParentLoadoutItemModel.cs b/src/NexusMods.App.UI/Pages/LoadoutPage/FakeParentLoadoutItemModel.cs
@@ -12,7 +12,7 @@ public class FakeParentLoadoutItemModel : LoadoutItemModel
     public required IObservable<DateTime> InstalledAtObservable { get; init; }
 
     public required IObservable<IChangeSet<LoadoutItemId, EntityId>> LoadoutItemIdsObservable { get; init; }
-    public ObservableList<LoadoutItemId> LoadoutItemIds { get; private set; } = [];
+    public ObservableHashSet<LoadoutItemId> LoadoutItemIds { get; private set; } = [];
 
     public override IReadOnlyCollection<LoadoutItemId> GetLoadoutItemIds() => LoadoutItemIds;