feeder: fixed 'is new' indicator for non-table files when a simulator…

… filter is specified
stojy · Aug 21, 2023 · 7310ade · 7310ade
1 parent 25f696e
commit 7310ade
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/ClrVpin/Feeder/FeederResults.xaml b/ClrVpin/Feeder/FeederResults.xaml
@@ -339,7 +339,7 @@
                             materialDesign:HintAssist.Hint="Application"
                             Style="{StaticResource ComboBoxStyle}"
                             Width="90" Margin="10,0,0,0"
-                            ToolTip="Filter the tables based on the emulator application. Ignored for unmatched tables.">
+                            ToolTip="Filter the tables based on the simulator application. Ignored for unmatched tables.">
                     <b:Interaction.Triggers>
                       <controls:RoutedEventTrigger RoutedEvent="ComboBox.SelectionChanged">
                         <b:InvokeCommandAction Command="{Binding ApplicationFormatChangedCommand}" />

diff --git a/ClrVpin/Feeder/FeederResultsViewModel.cs b/ClrVpin/Feeder/FeederResultsViewModel.cs
@@ -375,6 +375,8 @@ private void UpdateOnlineGameFileDetails()
             {
                 var (fileCollectionType, fileCollection) = kv;
 
+                var fileCollectionTypeEnum = OnlineFileType.GetEnum(fileCollectionType);
+
                 fileCollection.ForEach(file =>
                 {
                     // flag file - if the update time range is satisfied
@@ -402,8 +404,9 @@ private void UpdateOnlineGameFileDetails()
                     if (file.IsNew && file is ImageFile { IsFullDmd: true } && !Settings.SelectedMiscFeatureOptions.Contains(MiscFeatureOptionEnum.FullDmd)) 
                         file.IsNew = false;
 
-                    // - emulator application, aka file format, e.g. VPX, FP, etc
-                    if (file.IsNew && Settings.SelectedApplicationFormatFilter != null && (file as TableFile)?.TableFormat != Settings.SelectedApplicationFormatFilter)
+                    // - simulator application, aka file format, e.g. VPX, FP, etc
+                    if (file.IsNew && Settings.SelectedApplicationFormatFilter != null && fileCollectionTypeEnum == OnlineFileTypeEnum.Tables &&
+                        (file as TableFile)?.TableFormat != Settings.SelectedApplicationFormatFilter)
                         file.IsNew = false;
 
                     // flag each url within the file - required to allow for simpler view binding

diff --git a/ClrVpin/Models/Feeder/OnlineFileType.cs b/ClrVpin/Models/Feeder/OnlineFileType.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Utils.Extensions;
+
+namespace ClrVpin.Models.Feeder;
+
+public static class OnlineFileType
+{
+    public static OnlineFileTypeEnum GetEnum(string onlineFileType)
+    {
+        _onlineFileTypeDictionary ??= Enum.GetValues<OnlineFileTypeEnum>().ToDictionary(value => value.GetDescription(), value => value);
+
+        return _onlineFileTypeDictionary[onlineFileType];
+    }
+
+    private static Dictionary<string, OnlineFileTypeEnum> _onlineFileTypeDictionary;
+}