Flip empty filter, remove has ISBN

DSPaul · Sep 18, 2024 · 6c79745 · 6c79745
1 parent 4973526
commit 6c79745
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 59 deletions.
diff --git a/src/Models/CodexProperties/CodexProperty.cs b/src/Models/CodexProperties/CodexProperty.cs
@@ -96,16 +96,17 @@ public void UpdateSources()
 
         public static CodexProperty? GetInstance(string propName) => propName switch
         {
-            nameof(Codex.Title) => new StringProperty(nameof(Codex.Title)),
-            nameof(Codex.Authors) => new EnumerableProperty<string>(nameof(Codex.Authors)),
-            nameof(Codex.Publisher) => new StringProperty(nameof(Codex.Publisher)),
-            nameof(Codex.Version) => new StringProperty(nameof(Codex.Version)),
-            nameof(Codex.PageCount) => new NumberProperty<int>(nameof(Codex.PageCount), label: "Pagecount"),
-            nameof(Codex.Tags) => new TagsProperty(nameof(Codex.Tags)),
-            nameof(Codex.Description) => new StringProperty(nameof(Codex.Description)),
-            nameof(Codex.ReleaseDate) => new DateTimeProperty(nameof(Codex.ReleaseDate), label: "Release Date"),
-            nameof(Codex.CoverArt) => new CoverArtProperty(nameof(Codex.CoverArt), label: "Cover Art"),
-            nameof(Codex.Rating) => new NumberProperty<int>(nameof(Codex.Rating)),
+            nameof(Codex.Title) => new StringProperty(propName),
+            nameof(Codex.Authors) => new EnumerableProperty<string>(propName),
+            nameof(Codex.Publisher) => new StringProperty(propName),
+            nameof(Codex.Version) => new StringProperty(propName),
+            nameof(Codex.PageCount) => new NumberProperty<int>(propName, label: "Pagecount"),
+            nameof(Codex.Tags) => new TagsProperty(propName),
+            nameof(Codex.Description) => new StringProperty(propName),
+            nameof(Codex.ReleaseDate) => new DateTimeProperty(propName, label: "Release Date"),
+            nameof(Codex.CoverArt) => new CoverArtProperty(propName, label: "Cover Art"),
+            nameof(Codex.Rating) => new NumberProperty<int>(propName),
+            nameof(Codex.Sources.ISBN) => new StringProperty($"{nameof(Codex.Sources)}.{nameof(Codex.Sources.ISBN)}", label: "ISBN"),
             _ => null //could occur when a new preference file with new props is loaded into an older version of compass
         };
 
@@ -189,7 +190,7 @@ public CodexProperty(string propName, string? label = null) :
 
         public virtual T? GetProp(IHasCodexMetadata codex)
         {
-            object? value = codex.GetPropertyValue(Name);
+            object? value = codex.GetDeepPropertyValue(Name);
             return value == null ? default : (T)value;
         }
 

diff --git a/src/Models/Filters/EmptyFilter.cs b/src/Models/Filters/EmptyFilter.cs
diff --git a/src/Models/Filters/FilterType.cs b/src/Models/Filters/FilterType.cs
@@ -15,7 +15,6 @@ public enum FilterType
         Favorite,
         FileExtension,
         HasBrokenPath,
-        HasISBN,
         Domain,
         Empty
     }

diff --git a/src/Models/Filters/HasISBNFilter.cs b/src/Models/Filters/HasISBNFilter.cs
diff --git a/src/Models/Filters/NotEmptyFilter.cs b/src/Models/Filters/NotEmptyFilter.cs
@@ -0,0 +1,20 @@
+using COMPASS.Models.CodexProperties;
+using System.Windows.Media;
+
+namespace COMPASS.Models.Filters
+{
+    internal class NotEmptyFilter : Filter
+    {
+        public NotEmptyFilter(CodexProperty filterValue) : base(FilterType.Empty, filterValue)
+        {
+        }
+
+        private CodexProperty prop => (CodexProperty)FilterValue!;
+
+        public override Color BackgroundColor => Colors.LightSlateGray;
+
+        public override string Content => $"Has value for '{prop.Label}'";
+
+        public override bool Apply(Codex codex) => !prop.IsEmpty(codex);
+    }
+}
diff --git a/src/ViewModels/FilterViewModel.cs b/src/ViewModels/FilterViewModel.cs
@@ -95,7 +95,6 @@ public string SearchTerm
                 new OfflineSourceFilter(),
                 new OnlineSourceFilter(),
                 new PhysicalSourceFilter(),
-                new HasISBNFilter(),
                 new FavoriteFilter(),
             };
 
@@ -165,30 +164,31 @@ public ObservableCollection<string> DomainList
             set => SetProperty(ref _domainList, value);
         }
 
-        public CodexProperty SelectedEmptyProperty
+        public CodexProperty SelectedNotEmptyProperty
         {
             set
             {
                 if (value is not null)
                 {
-                    Filter emptyFilter = new EmptyFilter(value);
-                    AddFilter(emptyFilter, Include);
+                    Filter notEmptyFilter = new NotEmptyFilter(value);
+                    AddFilter(notEmptyFilter, Include);
                 }
             }
         }
 
         public List<CodexProperty> PossibleEmptyProperties { get; } = new()
         {
-            CodexProperty.GetInstance(nameof(Codex.Title))!,
             CodexProperty.GetInstance(nameof(Codex.Authors))!,
-            CodexProperty.GetInstance(nameof(Codex.Publisher))!,
+            CodexProperty.GetInstance(nameof(Codex.CoverArt))!,
             CodexProperty.GetInstance(nameof(Codex.Description))!,
-            CodexProperty.GetInstance(nameof(Codex.ReleaseDate))!,
+            CodexProperty.GetInstance(nameof(Codex.Sources.ISBN))!,
             CodexProperty.GetInstance(nameof(Codex.PageCount))!,
-            CodexProperty.GetInstance(nameof(Codex.Version))!,
-            CodexProperty.GetInstance(nameof(Codex.Tags))!,
-            CodexProperty.GetInstance(nameof(Codex.CoverArt))!,
+            CodexProperty.GetInstance(nameof(Codex.Publisher))!,
             CodexProperty.GetInstance(nameof(Codex.Rating))!,
+            CodexProperty.GetInstance(nameof(Codex.ReleaseDate))!,
+            CodexProperty.GetInstance(nameof(Codex.Tags))!,
+            CodexProperty.GetInstance(nameof(Codex.Title))!,
+            CodexProperty.GetInstance(nameof(Codex.Version))!,
         };
 
         //Selected Start and Stop Release Dates

diff --git a/src/Views/LeftDockView.xaml b/src/Views/LeftDockView.xaml
@@ -475,12 +475,12 @@
                                           SelectedValue="{Binding SelectedDomain,  Mode=OneWayToSource, UpdateSourceTrigger=LostFocus}" />
                             </Grid>
 
-                            <TextBlock Text="No value for:" Margin="0,5"/>
+                            <TextBlock Text="Has a value for:" Margin="0,5"/>
                             <Grid>
                                 <TextBlock Text="-- Select Property --" HorizontalAlignment="Center" Margin="0,0,20,0"/>
                                 <ComboBox ItemsSource="{Binding PossibleEmptyProperties}" DisplayMemberPath="Label"
                                           FontSize="15" Style="{StaticResource ContentLess}"
-                                          SelectedValue="{Binding SelectedEmptyProperty,  Mode=OneWayToSource, UpdateSourceTrigger=LostFocus}" />
+                                          SelectedValue="{Binding SelectedNotEmptyProperty,  Mode=OneWayToSource, UpdateSourceTrigger=LostFocus}" />
                             </Grid>
                         </StackPanel>
                         <Button Content="Clear All" Grid.Row="4" Margin="10" Command="{Binding ClearFiltersCommand}"