Implement BeatmapSearchMultipleSelectionFilterRow

osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);
             control.Language.BindValueChanged(l => language.Text = $"Language: {l.NewValue}", true);
-            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {e.NewValue}", true);
+            control.Extra.BindValueChanged(e => extra.Text = $"Extra: {(e.NewValue == null ? "" : string.Join(".", e.NewValue.Select(i => i.ToString().ToLowerInvariant())))}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
         }
 

osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Overlays;
@@ -21,7 +23,7 @@ namespace osu.Game.Online.API.Requests
 
         public SearchLanguage Language { get; }
 
-        public SearchExtra Extra { get; }
+        public List<SearchExtra> Extra { get; }
 
         public SearchPlayed Played { get; }
 
@@ -40,7 +42,7 @@ namespace osu.Game.Online.API.Requests
             SortDirection sortDirection = SortDirection.Descending,
             SearchGenre genre = SearchGenre.Any,
             SearchLanguage language = SearchLanguage.Any,
-            SearchExtra extra = SearchExtra.Any,
+            List<SearchExtra> extra = null,
             SearchPlayed played = SearchPlayed.Any)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
@@ -74,33 +76,14 @@ namespace osu.Game.Online.API.Requests
 
             req.AddParameter("sort", $"{SortCriteria.ToString().ToLowerInvariant()}_{directionString}");
 
-            req.AddCursor(cursor);
+            if (Extra != null && Extra.Any())
-
+                req.AddParameter("e", string.Join(".", Extra.Select(e => e.ToString().ToLowerInvariant())));
-            if (Extra != SearchExtra.Any)
-            {
-                string extraString = string.Empty;
-
-                switch (Extra)
-                {
-                    case SearchExtra.Both:
-                        extraString = "video.storyboard";
-                        break;
-
-                    case SearchExtra.Storyboard:
-                        extraString = "storyboard";
-                        break;
-
-                    case SearchExtra.Video:
-                        extraString = "video";
-                        break;
-                }
-
-                req.AddParameter("e", extraString);
-            }
 
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
+            req.AddCursor(cursor);
+
             return req;
         }
 

osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs

@@ -13,6 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
 using osu.Game.Rulesets;
+using System.Collections.Generic;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -28,7 +29,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchLanguage> Language => languageFilter.Current;
 
-        public Bindable<SearchExtra> Extra => extraFilter.Current;
+        public Bindable<List<SearchExtra>> Extra => extraFilter.Current;
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 

osu.Game/Overlays/BeatmapListing/BeatmapSearchExtraFilterRow.cs

@@ -1,94 +1,31 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osuTK;
-
 namespace osu.Game.Overlays.BeatmapListing
 {
-    public class BeatmapSearchExtraFilterRow : BeatmapSearchFilterRow<SearchExtra>
+    public class BeatmapSearchExtraFilterRow : BeatmapSearchMultipleSelectionFilterRow<SearchExtra>
     {
         public BeatmapSearchExtraFilterRow()
             : base("Extra")
         {
         }
 
-        protected override Drawable CreateFilter() => new ExtraFilter();
+        protected override MultipleSelectionFilter CreateMultipleSelectionFilter() => new ExtraFilter();
 
-        private class ExtraFilter : FillFlowContainer<ExtraFilterTabItem>, IHasCurrentValue<SearchExtra>
+        private class ExtraFilter : MultipleSelectionFilter
         {
-            private readonly BindableWithCurrent<SearchExtra> current = new BindableWithCurrent<SearchExtra>();
+            protected override MultipleSelectionFilterTabItem[] CreateItems() => new[]
-
-            public Bindable<SearchExtra> Current
             {
-                get => current.Current;
+                new ExtraFilterTabItem(SearchExtra.Video),
-                set => current.Current = value;
+                new ExtraFilterTabItem(SearchExtra.Storyboard)
+            };
         }
 
-            private readonly ExtraFilterTabItem videoItem;
+        private class ExtraFilterTabItem : MultipleSelectionFilterTabItem
-            private readonly ExtraFilterTabItem storyboardItem;
-
-            public ExtraFilter()
         {
-                Anchor = Anchor.BottomLeft;
-                Origin = Anchor.BottomLeft;
-                RelativeSizeAxes = Axes.X;
-                Height = 15;
-                Spacing = new Vector2(10, 0);
-                AddRange(new[]
-                {
-                    videoItem = new ExtraFilterTabItem(SearchExtra.Video),
-                    storyboardItem = new ExtraFilterTabItem(SearchExtra.Storyboard)
-                });
-
-                foreach (var item in Children)
-                    item.StateUpdated += updateBindable;
-            }
-
-            private void updateBindable()
-            {
-                if (videoItem.Active.Value && storyboardItem.Active.Value)
-                {
-                    Current.Value = SearchExtra.Both;
-                    return;
-                }
-
-                if (videoItem.Active.Value)
-                {
-                    Current.Value = SearchExtra.Video;
-                    return;
-                }
-
-                if (storyboardItem.Active.Value)
-                {
-                    Current.Value = SearchExtra.Storyboard;
-                    return;
-                }
-
-                Current.Value = SearchExtra.Any;
-            }
-        }
-
-        private class ExtraFilterTabItem : FilterTabItem
-        {
-            public event Action StateUpdated;
-
             public ExtraFilterTabItem(SearchExtra value)
                 : base(value)
             {
-                Active.BindValueChanged(_ => StateUpdated?.Invoke());
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                base.OnClick(e);
-                Active.Value = !Active.Value;
-                return true;
             }
 
             protected override string CreateText(SearchExtra value) => $@"Has {value.ToString()}";

osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs

@@ -1,20 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
-using osuTK.Graphics;
 using Humanizer;
 using osu.Game.Utils;
 
@@ -98,7 +94,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
             protected override Dropdown<T> CreateDropdown() => new FilterDropdown();
 
-            protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
+            protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem<T>(value);
 
             private class FilterDropdown : OsuTabDropdown<T>
             {
@@ -117,63 +113,5 @@ namespace osu.Game.Overlays.BeatmapListing
                 }
             }
         }
-
-        protected class FilterTabItem : TabItem<T>
-        {
-            protected virtual float TextSize => 13;
-
-            [Resolved]
-            private OverlayColourProvider colourProvider { get; set; }
-
-            private readonly OsuSpriteText text;
-
-            public FilterTabItem(T value)
-                : base(value)
-            {
-                AutoSizeAxes = Axes.Both;
-                Anchor = Anchor.BottomLeft;
-                Origin = Anchor.BottomLeft;
-                AddRangeInternal(new Drawable[]
-                {
-                    text = new OsuSpriteText
-                    {
-                        Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
-                        Text = CreateText(value)
-                    },
-                    new HoverClickSounds()
-                });
-
-                Enabled.Value = true;
-            }
-
-            protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                updateState();
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                base.OnHover(e);
-                updateState();
-                return true;
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                base.OnHoverLost(e);
-                updateState();
-            }
-
-            protected override void OnActivated() => updateState();
-
-            protected override void OnDeactivated() => updateState();
-
-            private void updateState() => text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
-
-            private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
-        }
     }
 }

osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs

@@ -0,0 +1,83 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osuTK;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public abstract class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow<List<T>>
+    {
+        public BeatmapSearchMultipleSelectionFilterRow(string headerName)
+            : base(headerName)
+        {
+        }
+
+        protected override Drawable CreateFilter() => CreateMultipleSelectionFilter();
+
+        protected abstract MultipleSelectionFilter CreateMultipleSelectionFilter();
+
+        protected abstract class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>, IHasCurrentValue<List<T>>
+        {
+            private readonly BindableWithCurrent<List<T>> current = new BindableWithCurrent<List<T>>();
+
+            public Bindable<List<T>> Current
+            {
+                get => current.Current;
+                set => current.Current = value;
+            }
+
+            public MultipleSelectionFilter()
+            {
+                Anchor = Anchor.BottomLeft;
+                Origin = Anchor.BottomLeft;
+                RelativeSizeAxes = Axes.X;
+                Height = 15;
+                Spacing = new Vector2(10, 0);
+                AddRange(CreateItems());
+
+                foreach (var item in Children)
+                    item.StateUpdated += updateBindable;
+            }
+
+            protected abstract MultipleSelectionFilterTabItem[] CreateItems();
+
+            private void updateBindable()
+            {
+                var selectedValues = new List<T>();
+
+                foreach (var item in Children)
+                {
+                    if (item.Active.Value)
+                        selectedValues.Add(item.Value);
+                }
+
+                Current.Value = selectedValues;
+            }
+        }
+
+        protected class MultipleSelectionFilterTabItem : FilterTabItem<T>
+        {
+            public event Action StateUpdated;
+
+            public MultipleSelectionFilterTabItem(T value)
+                : base(value)
+            {
+                Active.BindValueChanged(_ => StateUpdated?.Invoke());
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                base.OnClick(e);
+                Active.Value = !Active.Value;
+                return true;
+            }
+        }
+    }
+}

osu.Game/Overlays/BeatmapListing/FilterTabItem.cs

@@ -0,0 +1,74 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class FilterTabItem<T> : TabItem<T>
+    {
+        protected virtual float TextSize => 13;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        private readonly OsuSpriteText text;
+
+        public FilterTabItem(T value)
+            : base(value)
+        {
+            AutoSizeAxes = Axes.Both;
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+            AddRangeInternal(new Drawable[]
+            {
+                text = new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
+                    Text = CreateText(value)
+                },
+                new HoverClickSounds()
+            });
+
+            Enabled.Value = true;
+        }
+
+        protected virtual string CreateText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            updateState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            base.OnHover(e);
+            updateState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            updateState();
+        }
+
+        protected override void OnActivated() => updateState();
+
+        protected override void OnDeactivated() => updateState();
+
+        private void updateState() => text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
+
+        private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
+    }
+}

osu.Game/Overlays/BeatmapListing/SearchExtra.cs

@@ -5,9 +5,7 @@ namespace osu.Game.Overlays.BeatmapListing
 {
     public enum SearchExtra
     {
-        Any,
         Video,
-        Storyboard,
+        Storyboard
-        Both
     }
 }