Merge pull request #140 from DennisvHest/101-in-dynamic-playlist-conf…

…iguration-use-dropdowns-with-pre-defined-options-whenever-possible 101 in dynamic playlist configuration use dropdowns with pre defined options whenever possible
DennisvHest · Feb 11, 2024 · 81a017a · 81a017a
2 parents 1b7468e + e5d9f22
commit 81a017a
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 12 deletions.
diff --git a/MapMaven.Core/Models/DynamicPlaylists/DynamicPlaylistFieldOption.cs b/MapMaven.Core/Models/DynamicPlaylists/DynamicPlaylistFieldOption.cs
@@ -5,5 +5,6 @@ public class DynamicPlaylistFieldOption
         public string Value { get; set; }
         public string Name { get; set; }
         public Type Type { get; set; }
+        public bool HasPredefinedOptions { get; set; }
     }
 }
diff --git a/MapMaven.Core/Models/DynamicPlaylists/FilterOperator.cs b/MapMaven.Core/Models/DynamicPlaylists/FilterOperator.cs
@@ -8,6 +8,7 @@ public enum FilterOperator
         GreaterThan,
         LessThanOrEqual,
         GreaterThanOrEqual,
-        Contains
+        Contains,
+        NotContains,
     }
 }
diff --git a/MapMaven.Core/Models/DynamicPlaylists/MapInfo/DynamicPlaylistMap.cs b/MapMaven.Core/Models/DynamicPlaylists/MapInfo/DynamicPlaylistMap.cs
@@ -1,4 +1,5 @@
-using MapMaven.Models;
+using MapMaven.Core.Utilities.DynamicPlaylists;
+using MapMaven.Models;
 using MapMaven.Utilities.DynamicPlaylists;
 using System.ComponentModel;
 
@@ -28,9 +29,11 @@ public class DynamicPlaylistMap
         public double Stars { get; set; }
 
         [ApplicableForMapPool(MapPool.Improvement)]
+        [HasPredefinedOptions]
         public string Difficulty { get; set; }
 
         [ApplicableForMapPool(MapPool.Improvement)]
+        [HasPredefinedOptions]
         public IEnumerable<string> Tags { get; set; } = [];
 
         public DynamicPlaylistScore? Score { get; set; }

diff --git a/MapMaven.Core/Services/DynamicPlaylistArrangementService.cs b/MapMaven.Core/Services/DynamicPlaylistArrangementService.cs
@@ -28,11 +28,11 @@ public class DynamicPlaylistArrangementService
 
         public static readonly Dictionary<Type, IEnumerable<FilterOperator>> FilterOperatorsForType = new()
         {
-            { typeof(string), new[] { FilterOperator.Equals, FilterOperator.NotEquals, FilterOperator.Contains } },
+            { typeof(string), new[] { FilterOperator.Equals, FilterOperator.NotEquals, FilterOperator.Contains, FilterOperator.NotContains } },
             { typeof(bool), new[] { FilterOperator.Equals, FilterOperator.NotEquals } },
             { typeof(double), new[] { FilterOperator.Equals, FilterOperator.NotEquals, FilterOperator.GreaterThan, FilterOperator.LessThan, FilterOperator.GreaterThanOrEqual, FilterOperator.LessThanOrEqual } },
             { typeof(DateTime), new[] { FilterOperator.Equals, FilterOperator.NotEquals, FilterOperator.GreaterThan, FilterOperator.LessThan, FilterOperator.GreaterThanOrEqual, FilterOperator.LessThanOrEqual } },
-            { typeof(IEnumerable<string>), new[] { FilterOperator.Contains } },
+            { typeof(IEnumerable<string>), new[] { FilterOperator.Contains, FilterOperator.NotContains } },
         };
 
         public DynamicPlaylistArrangementService(
@@ -136,10 +136,10 @@ public async Task ArrangeDynamicPlaylists()
                         playlistMaps = FilterMaps(playlistMaps, configuration);
                         playlistMaps = SortMaps(playlistMaps, configuration);
 
-                        playlistMaps = playlistMaps.Take(configuration.MapCount);
-
                         var resultPlaylistMaps = playlistMaps
                             .Select(m => m.Map)
+                            .DistinctBy(m => m.Hash)
+                            .Take(configuration.MapCount)
                             .ToList();
 
                         await _playlistService.DownloadPlaylistMapsIfNotExist(resultPlaylistMaps, loadMapInfo: false);
@@ -191,6 +191,7 @@ private bool FilterOperationMatches(DynamicPlaylistMapPair mapPair, FilterOperat
                     FilterOperator.Equals => stringValue.Equals(filterOperation.Value, StringComparison.OrdinalIgnoreCase),
                     FilterOperator.NotEquals => !stringValue.Equals(filterOperation.Value, StringComparison.OrdinalIgnoreCase),
                     FilterOperator.Contains => stringValue.Contains(filterOperation.Value, StringComparison.OrdinalIgnoreCase),
+                    FilterOperator.NotContains => !stringValue.Contains(filterOperation.Value, StringComparison.OrdinalIgnoreCase),
                     _ => false
                 };
             }
@@ -244,6 +245,7 @@ private bool FilterOperationMatches(DynamicPlaylistMapPair mapPair, FilterOperat
                 return filterOperation.Operator switch
                 {
                     FilterOperator.Contains => stringEnumerableValue.Contains(filterOperation.Value, StringComparer.OrdinalIgnoreCase),
+                    FilterOperator.NotContains => !stringEnumerableValue.Contains(filterOperation.Value, StringComparer.OrdinalIgnoreCase),
                     _ => false
                 };
             }

diff --git a/MapMaven.Core/Utilities/DifficultyUtils.cs b/MapMaven.Core/Utilities/DifficultyUtils.cs
@@ -14,5 +14,13 @@ public static int GetOrder(string? difficulty)
                 _ => 0
             };
         }
+
+        public static IEnumerable<string> Difficulties => [
+            "Easy",
+            "Normal",
+            "Hard",
+            "Expert",
+            "ExpertPlus"
+        ];
     }
 }
diff --git a/MapMaven.Core/Utilities/DynamicPlaylists/HasPredefinedOptions.cs b/MapMaven.Core/Utilities/DynamicPlaylists/HasPredefinedOptions.cs
@@ -0,0 +1,7 @@
+namespace MapMaven.Core.Utilities.DynamicPlaylists
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public class HasPredefinedOptions : Attribute
+    {
+    }
+}
diff --git a/MapMaven/Components/Playlists/FilterOperationInput.razor b/MapMaven/Components/Playlists/FilterOperationInput.razor
@@ -44,7 +44,23 @@
     @switch (SelectedFieldOption?.Type)
     {
         case Type type when type == typeof(string):
-            <MudTextField @bind-Value="FilterOperation.Value" Label="Value" Variant="Variant.Outlined" Margin="Margin.Dense" Class="pl-2 d-block" Style="max-width: 168px;" />
+            @if (SelectedFieldOption.HasPredefinedOptions)
+            {
+                <MudSelectExtended T="string"
+                    ItemCollection="GetFieldOptions()"
+                    Margin="Margin.Dense"
+                    Dense="true"
+                    SearchBox="true"
+                    SearchBoxAutoFocus="true"
+                    SearchBoxClearable="true"
+                    Variant="Variant.Outlined"
+                    Class="pl-2 d-block"
+                    @bind-Value="FilterOperation.Value" />
+            }
+            else
+            {
+                <MudTextField @bind-Value="FilterOperation.Value" Label="Value" Variant="Variant.Outlined" Margin="Margin.Dense" Class="pl-2 d-block" Style="max-width: 168px;" />
+            }
             break;
         case Type type when Numeric.Is(type):
             <MudNumericField Value="FilterOperation.Value" TextChanged="DoubleValueChanged" Label="Value" Variant="Variant.Outlined" Margin="Margin.Dense" Class="pl-2 d-block" Style="max-width: 168px;" />

diff --git a/MapMaven/Components/Playlists/FilterOperationInput.razor.cs b/MapMaven/Components/Playlists/FilterOperationInput.razor.cs
@@ -5,6 +5,9 @@
 using MapMaven.Core.Models.DynamicPlaylists.MapInfo;
 using MapMaven.Core.Services.Interfaces;
 using MapMaven.Core.Services;
+using System.Reflection;
+using MapMaven.Core.Utilities.DynamicPlaylists;
+using MapMaven.Core.Utilities;
 
 namespace MapMaven.Components.Playlists
 {
@@ -67,17 +70,20 @@ ICollection<string> GetFieldOptions()
         {
             var options = FilterOperation.Field switch
             {
+                nameof(DynamicPlaylistMap.Difficulty) => DifficultyUtils.Difficulties,
                 nameof(DynamicPlaylistMap.Tags) => MapService.MapTags,
                 _ => []
             };
 
             if (FilterOperation.Value is not null)
                 options = options.Concat([FilterOperation.Value]);
 
-            return options
-                .Distinct()
-                .OrderBy(x => x)
-                .ToList();
+            options = options.Distinct();
+
+            if (FilterOperation.Field != nameof(DynamicPlaylistMap.Difficulty))
+                options = options.OrderBy(x => x);
+
+            return options.ToList();
         }
     }
 }
diff --git a/MapMaven/Extensions/EnumExtensions.cs b/MapMaven/Extensions/EnumExtensions.cs
@@ -15,6 +15,7 @@ public static string DisplayName(this FilterOperator filterOperator)
                 FilterOperator.LessThan => "<",
                 FilterOperator.LessThanOrEqual => "<=",
                 FilterOperator.Contains => "contains",
+                FilterOperator.NotContains => "doesn't contain",
                 _ => string.Empty
             };
         }

diff --git a/MapMaven/Utility/DynamicPlaylistFields.cs b/MapMaven/Utility/DynamicPlaylistFields.cs
@@ -3,6 +3,7 @@
 using System.Reflection;
 using System.ComponentModel;
 using MapMaven.Utilities.DynamicPlaylists;
+using MapMaven.Core.Utilities.DynamicPlaylists;
 
 namespace MapMaven.Utility
 {
@@ -28,13 +29,16 @@ private static IEnumerable<DynamicPlaylistFieldOption> GetFieldOptionsForType(Ty
 
                 var name = displayNameAttribute?.DisplayName ?? property.Name;
 
+                var hasPredefinedOptionsAttribute = property.GetCustomAttribute<HasPredefinedOptions>(); 
+
                 return new[]
                 {
                     new DynamicPlaylistFieldOption
                     {
                         Value = value,
                         Name = name,
-                        Type = property.PropertyType
+                        Type = property.PropertyType,
+                        HasPredefinedOptions = hasPredefinedOptionsAttribute is not null
                     }
                 };
             });