Song select filtering by ddevault · Pull Request #299 · ppy/osu

ddevault · 2017-01-27T20:45:54Z

Includes basic sorting+grouping UI, implementation to come separately.

…ring

Sign in to view

+                        if (!importer.Import(Path.GetFullPath(file)).Wait(3000))
                            throw new TimeoutException(@"IPC took too long to send");
-                    Console.WriteLine(@"Sent import requests to running instance");
+                        Thread.Sleep(500);


Sign in to view

                {
                    var importer = new BeatmapImporter(host);
-
+                    Directory.SetCurrentDirectory(cwd);


Sign in to view

        {
            LegacyFilesystemReader.Register();
+
+            var cwd = Directory.GetCurrentDirectory();


Sign in to view

-            set
-            {
-                state = value;
+        public bool Hidden;


Sign in to view

        {
            Beatmap = beatmap;
+            if (beatmap == null)
+                Add(background = new Background(@"Backgrounds/bg1"));


Sign in to view

            }
        }

+        public void InvalidateVisible()


Sign in to view

+{
+    public class FilterControl : Container
+    {
+        public enum SortMode


Sign in to view

+
+        public Action FilterChanged;
+
+        public string Search { get; private set; } = string.Empty;


Sign in to view

+
+        private void filterChanged()
+        {
+            if (filterTask != null)


Sign in to view

+                foreach (var beatmapGroup in carousel)
+                {
+                    var set = beatmapGroup.BeatmapSet;
+                    if (set == null)


Sign in to view

+                        || (set.Metadata.TitleUnicode ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1;
+                    if (match)
+                    {
+                        changed = changed && !beatmapGroup.Hidden;


Sign in to view

+                    {
+                        changed = changed && !beatmapGroup.Hidden;
+                        beatmapGroup.Hidden = false;
+                        beatmapGroup.Header.Alpha = 1;


Sign in to view

+                    {
+                        changed = changed && beatmapGroup.Hidden;
+                        beatmapGroup.Hidden = true;
+                        beatmapGroup.Header.Alpha = 0;


peppy · 2017-01-28T04:42:35Z

Escape key doesn't work at song select any more.
Consider making the Hidden thing a state of BeatmapGroupState rather than this bool Hidden poop.

ddevault · 2017-01-28T09:12:25Z

Consider making the Hidden thing a state of BeatmapGroupState rather than this bool Hidden poop.

I did consider that, but it complicates things, imo a bit too much.

…ring

Sign in to view


        private BeatmapGroupState state;
-
+        


Sign in to view

                        break;
                    case BeatmapGroupState.Collapsed:
+                    case BeatmapGroupState.Hidden:
+                        if (state == BeatmapGroupState.Hidden && state != value)


…ring

Sign in to view

        {
            base.OnEntering(last);

-            (Background as BackgroundModeBeatmap)?.BlurTo(Vector2.Zero, 1000);


Sign in to view


                        //on first display we want to begin hidden under our group's header.
-                        if (panel.Alpha == 0)
+                        if (panel.Alpha == 0 && group.State != BeatmapGroupState.Hidden)


Sign in to view

                            panel.MoveToY(headerY);

-                        movePanel(panel, true, ref currentY);
+                        movePanel(panel, group.State != BeatmapGroupState.Hidden, ref currentY);


Sign in to view

            SelectGroup(group, panel);
        }
+
+        public IEnumerator<BeatmapGroup> GetEnumerator()


Sign in to view

+            return groups.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()


OnCommit only gets fired when focus is lost

Frustratingly, this does not fix the problem of ghost groups

I had earlier thought that removing this would solve the weirdness with starting the beatmap on any but the first difficulty, and forgot to replace it when I found the actual cause.

peppy · 2017-02-02T10:41:23Z

Posted fixes for remaining issues at ddevault#1.

Fixes inconsistencies and shortcomings of filtering.

Sign in to view

                {
-                    Background newBackground = new BeatmapBackground(beatmap);
+                    Background newBackground;
+                    if (beatmap == null)


Sign in to view

+                        || (set.Metadata.ArtistUnicode ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
+                        || (set.Metadata.Title ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1
+                        || (set.Metadata.TitleUnicode ?? "").IndexOf(search, StringComparison.InvariantCultureIgnoreCase) != -1;
+                    if (match)


ddevault added 10 commits January 17, 2017 15:41

Initial layout of song select filtering UI

73e46ee

Move filter container z depth and add hover fx

63031fb

Rename FilterSongSelect, use OsuColour

5eb1cda

Use default background on empty song select screen

7559fc5

Improve beatmap import

46e7bce

Use OsuColour for green text

75de03b

Implement filtering with strings

678f0aa

Merge remote-tracking branch 'upstream/master' into song-select-filte…

417933b

…ring

Fixes following recent updates upstream

f3c5c1f

Merge remote-tracking branch 'upstream/master' into song-select-filte…

1089748

…ring