Fixed source priority lists going out of sync

DSPaul · Oct 24, 2024 · f919018 · f919018
1 parent a54c6eb
commit f919018
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Models/CodexProperties/CodexProperty.cs b/src/Models/CodexProperties/CodexProperty.cs
@@ -1,22 +1,29 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using COMPASS.Tools;
 using COMPASS.ViewModels.Sources;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace COMPASS.Models.CodexProperties
 {
-    public abstract class CodexProperty : ObservableObject
+    public abstract class CodexProperty : ObservableObject, IDisposable
     {
         protected CodexProperty(string propName, string? label = null)
         {
             Name = propName;
             Label = label ?? propName;
             _defaultSourcePriority = GetDefaultSources(propName);
             UpdateSources();
+
+            SourcePriorityNamed = new(SourcePriority.Select(source => new NamedMetaDataSource(source)));
+            SourcePriorityNamed.CollectionChanged += SourcePriorityNamed_CollectionChanged;
         }
 
+        private void SourcePriorityNamed_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+            => SourcePriority = SourcePriorityNamed.Select(spn => spn.Source).ToList();
+
         #region Properties
 
         public string Name { get; init; }
@@ -45,12 +52,10 @@ protected CodexProperty(string propName, string? label = null)
 
         private readonly List<MetaDataSource> _defaultSourcePriority;
 
-        private ObservableCollection<NamedMetaDataSource>? _sourcePriorityNamed;
         /// <summary>
         /// Ordered List of sources that can set this prop, named for data binding
         /// </summary>
-        public ObservableCollection<NamedMetaDataSource> SourcePriorityNamed =>
-            _sourcePriorityNamed ??= new(SourcePriority.Select(source => new NamedMetaDataSource(source)));
+        public ObservableCollection<NamedMetaDataSource> SourcePriorityNamed { get; }
 
         private List<MetaDataSource> _sourcePriority = new();
         /// <summary>
@@ -176,6 +181,7 @@ public void UpdateSources()
                 },
             _ => new(),
         };
+        public void Dispose() => SourcePriorityNamed.CollectionChanged -= SourcePriorityNamed_CollectionChanged;
 
         #endregion
     }

diff --git a/src/ViewModels/FilterViewModel.cs b/src/ViewModels/FilterViewModel.cs
@@ -176,7 +176,7 @@ public CodexProperty SelectedNotEmptyProperty
             }
         }
 
-        public List<CodexProperty> PossibleEmptyProperties { get; } = new()
+        public static List<CodexProperty> PossibleEmptyProperties { get; } = new()
         {
             CodexProperty.GetInstance(nameof(Codex.Authors))!,
             CodexProperty.GetInstance(nameof(Codex.CoverArt))!,