Merge pull request #11118 from MiraiSubject/tourney-switching-ui

Add the ability to switch tournaments to the SetupScreen

osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs

@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Tournament.Screens;
+using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {

osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs

@@ -1,7 +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 osu.Game.Tournament.Screens;
+using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {

osu.Game.Tournament/IO/TournamentStorage.cs

@@ -1,10 +1,12 @@
 // 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 osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
 using System.IO;
+using System.Collections.Generic;
 using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament.IO
@@ -13,25 +15,39 @@ namespace osu.Game.Tournament.IO
     {
         private const string default_tournament = "default";
         private readonly Storage storage;
+        private readonly Storage allTournaments;
         private readonly TournamentStorageManager storageConfig;
+        public readonly Bindable<string> CurrentTournament;
 
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.storage = storage;
+            allTournaments = UnderlyingStorage;
 
             storageConfig = new TournamentStorageManager(storage);
 
             if (storage.Exists("tournament.ini"))
             {
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
+                ChangeTargetStorage(allTournaments.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
-                Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
+                Migrate(allTournaments.GetStorageForDirectory(default_tournament));
 
+            CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
+
+            CurrentTournament.BindValueChanged(updateTournament);
         }
 
+        private void updateTournament(ValueChangedEvent<string> newTournament)
+        {
+            ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
+            Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
+        }
+
+        public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
+
         public override void Migrate(Storage newStorage)
         {
             // this migration only happens once on moving to the per-tournament storage system.

osu.Game.Tournament/Screens/Setup/ActionableInfo.cs

@@ -0,0 +1,72 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class ActionableInfo : LabelledDrawable<Drawable>
+    {
+        protected OsuButton Button;
+
+        public ActionableInfo()
+            : base(true)
+        {
+        }
+
+        public string ButtonText
+        {
+            set => Button.Text = value;
+        }
+
+        public string Value
+        {
+            set => valueText.Text = value;
+        }
+
+        public bool Failing
+        {
+            set => valueText.Colour = value ? Color4.Red : Color4.White;
+        }
+
+        public Action Action;
+
+        private TournamentSpriteText valueText;
+        protected FillFlowContainer FlowContainer;
+
+        protected override Drawable CreateComponent() => new Container
+        {
+            AutoSizeAxes = Axes.Y,
+            RelativeSizeAxes = Axes.X,
+            Children = new Drawable[]
+            {
+                valueText = new TournamentSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                FlowContainer = new FillFlowContainer
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    AutoSizeAxes = Axes.Both,
+                    Spacing = new Vector2(10, 0),
+                    Children = new Drawable[]
+                    {
+                        Button = new TriangleButton
+                        {
+                            Size = new Vector2(100, 40),
+                            Action = () => Action?.Invoke()
+                        }
+                    }
+                }
+            }
+        };
+    }
+}

osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs

@@ -0,0 +1,53 @@
+// 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.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class ResolutionSelector : ActionableInfo
+    {
+        private const int minimum_window_height = 480;
+        private const int maximum_window_height = 2160;
+
+        public new Action<int> Action;
+
+        private OsuNumberBox numberBox;
+
+        protected override Drawable CreateComponent()
+        {
+            var drawable = base.CreateComponent();
+            FlowContainer.Insert(-1, numberBox = new OsuNumberBox
+            {
+                Text = "1080",
+                Width = 100
+            });
+
+            base.Action = () =>
+            {
+                if (string.IsNullOrEmpty(numberBox.Text))
+                    return;
+
+                // box contains text
+                if (!int.TryParse(numberBox.Text, out var number))
+                {
+                    // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
+                    // so clamp to max allowed value
+                    number = maximum_window_height;
+                }
+                else
+                {
+                    number = Math.Clamp(number, minimum_window_height, maximum_window_height);
+                }
+
+                // in case number got clamped, reset number in numberBox
+                numberBox.Text = number.ToString();
+
+                Action?.Invoke(number);
+            };
+            return drawable;
+        }
+    }
+}

osu.Game.Tournament/Screens/Setup/SetupScreen.cs

@@ -1,7 +1,6 @@
 // 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 System.Drawing;
 using osu.Framework.Allocation;
@@ -17,9 +16,8 @@ using osu.Game.Rulesets;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osuTK;
-using osuTK.Graphics;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament.Screens.Setup
 {
     public class SetupScreen : TournamentScreen, IProvideVideo
     {
@@ -64,9 +62,6 @@ namespace osu.Game.Tournament.Screens
             reload();
         }
 
-        [Resolved]
-        private Framework.Game game { get; set; }
-
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
@@ -111,6 +106,11 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
+                new TournamentSwitcher
+                {
+                    Label = "Current tournament",
+                    Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
+                },
                 resolution = new ResolutionSelector
                 {
                     Label = "Stream area resolution",
@@ -151,108 +151,5 @@ namespace osu.Game.Tournament.Screens
                 Width = 0.5f,
             };
         }
-
-        private class ActionableInfo : LabelledDrawable<Drawable>
-        {
-            private OsuButton button;
-
-            public ActionableInfo()
-                : base(true)
-            {
-            }
-
-            public string ButtonText
-            {
-                set => button.Text = value;
-            }
-
-            public string Value
-            {
-                set => valueText.Text = value;
-            }
-
-            public bool Failing
-            {
-                set => valueText.Colour = value ? Color4.Red : Color4.White;
-            }
-
-            public Action Action;
-
-            private TournamentSpriteText valueText;
-            protected FillFlowContainer FlowContainer;
-
-            protected override Drawable CreateComponent() => new Container
-            {
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Children = new Drawable[]
-                {
-                    valueText = new TournamentSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                    },
-                    FlowContainer = new FillFlowContainer
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(10, 0),
-                        Children = new Drawable[]
-                        {
-                            button = new TriangleButton
-                            {
-                                Size = new Vector2(100, 40),
-                                Action = () => Action?.Invoke()
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        private class ResolutionSelector : ActionableInfo
-        {
-            private const int minimum_window_height = 480;
-            private const int maximum_window_height = 2160;
-
-            public new Action<int> Action;
-
-            private OsuNumberBox numberBox;
-
-            protected override Drawable CreateComponent()
-            {
-                var drawable = base.CreateComponent();
-                FlowContainer.Insert(-1, numberBox = new OsuNumberBox
-                {
-                    Text = "1080",
-                    Width = 100
-                });
-
-                base.Action = () =>
-                {
-                    if (string.IsNullOrEmpty(numberBox.Text))
-                        return;
-
-                    // box contains text
-                    if (!int.TryParse(numberBox.Text, out var number))
-                    {
-                        // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
-                        // so clamp to max allowed value
-                        number = maximum_window_height;
-                    }
-                    else
-                    {
-                        number = Math.Clamp(number, minimum_window_height, maximum_window_height);
-                    }
-
-                    // in case number got clamped, reset number in numberBox
-                    numberBox.Text = number.ToString();
-
-                    Action?.Invoke(number);
-                };
-                return drawable;
-            }
-        }
     }
 }

osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs

@@ -13,11 +13,11 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
-using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.IPC;
 using osuTK;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament.Screens.Setup
 {
     public class StablePathSelectScreen : TournamentScreen
     {

osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs

@@ -0,0 +1,44 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.IO;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class TournamentSwitcher : ActionableInfo
+    {
+        private OsuDropdown<string> dropdown;
+
+        [Resolved]
+        private TournamentGameBase game { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(TournamentStorage storage)
+        {
+            string startupTournament = storage.CurrentTournament.Value;
+
+            dropdown.Current = storage.CurrentTournament;
+            dropdown.Items = storage.ListTournaments();
+            dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
+
+            Action = () => game.GracefullyExit();
+
+            ButtonText = "Close osu!";
+        }
+
+        protected override Drawable CreateComponent()
+        {
+            var drawable = base.CreateComponent();
+
+            FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
+            {
+                Width = 510
+            });
+
+            return drawable;
+        }
+    }
+}

osu.Game.Tournament/TournamentGameBase.cs

@@ -40,6 +40,8 @@ namespace osu.Game.Tournament
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
             dependencies.CacheAs<Storage>(storage = new TournamentStorage(baseStorage));
+            dependencies.CacheAs(storage);
+
             dependencies.Cache(new TournamentVideoResourceStore(storage));
 
             Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));

osu.Game.Tournament/TournamentSceneManager.cs

@@ -19,6 +19,7 @@ using osu.Game.Tournament.Screens.Gameplay;
 using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.MapPool;
 using osu.Game.Tournament.Screens.Schedule;
+using osu.Game.Tournament.Screens.Setup;
 using osu.Game.Tournament.Screens.Showcase;
 using osu.Game.Tournament.Screens.TeamIntro;
 using osu.Game.Tournament.Screens.TeamWin;

osu.Game/OsuGame.cs

@@ -942,18 +942,6 @@ namespace osu.Game
             return base.OnExiting();
         }
 
-        /// <summary>
-        /// Use to programatically exit the game as if the user was triggering via alt-f4.
-        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
-        /// </summary>
-        public void GracefullyExit()
-        {
-            if (!OnExiting())
-                Exit();
-            else
-                Scheduler.AddDelayed(GracefullyExit, 2000);
-        }
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();

osu.Game/OsuGameBase.cs

@@ -380,6 +380,18 @@ namespace osu.Game
                 : new OsuConfigManager(Storage);
         }
 
+        /// <summary>
+        /// Use to programatically exit the game as if the user was triggering via alt-f4.
+        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
+        /// </summary>
+        public void GracefullyExit()
+        {
+            if (!OnExiting())
+                Exit();
+            else
+                Scheduler.AddDelayed(GracefullyExit, 2000);
+        }
+
         protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
 
         private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();