Add map pool editing functionality to round editor

osu.Game.Tournament/Components/TournamentBeatmapPanel.cs

@@ -81,7 +81,7 @@ namespace osu.Game.Tournament.Components
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Text = new LocalisedString((
-                                $"{Beatmap.Metadata.ArtistUnicode} - {Beatmap.Metadata.TitleUnicode}",
+                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
                                 $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
                             Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
                         },

osu.Game.Tournament/Models/TournamentRound.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Tournament.Models
         public readonly BindableInt BestOf = new BindableInt(9) { Default = 9, MinValue = 3, MaxValue = 23 };
 
         [JsonProperty]
-        public readonly List<RoundBeatmap> Beatmaps = new List<RoundBeatmap>();
+        public readonly BindableList<RoundBeatmap> Beatmaps = new BindableList<RoundBeatmap>();
 
         public readonly Bindable<DateTimeOffset> StartDate = new Bindable<DateTimeOffset>();
 

osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs

@@ -2,12 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osuTK;
@@ -43,9 +49,16 @@ namespace osu.Game.Tournament.Screens.Editors
 
             public RoundRow(TournamentRound round)
             {
-                Margin = new MarginPadding(10);
-
                 Round = round;
+
+                Masking = true;
+                CornerRadius = 10;
+
+                RoundBeatmapEditor beatmapEditor = new RoundBeatmapEditor(round)
+                {
+                    Width = 0.95f
+                };
+
                 InternalChildren = new Drawable[]
                 {
                     new Box
@@ -87,6 +100,14 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Width = 0.33f,
                                 Bindable = Round.BestOf
                             },
+                            new SettingsButton
+                            {
+                                Width = 0.2f,
+                                Margin = new MarginPadding(10),
+                                Text = "Add beatmap",
+                                Action = () => beatmapEditor.CreateNew()
+                            },
+                            beatmapEditor
                         }
                     },
                     new DangerousSettingsButton
@@ -107,6 +128,170 @@ namespace osu.Game.Tournament.Screens.Editors
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
             }
+
+            public class RoundBeatmapEditor : CompositeDrawable
+            {
+                private readonly TournamentRound round;
+                private readonly FillFlowContainer flow;
+
+                public RoundBeatmapEditor(TournamentRound round)
+                {
+                    this.round = round;
+
+                    RelativeSizeAxes = Axes.X;
+                    AutoSizeAxes = Axes.Y;
+
+                    InternalChild = flow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        LayoutDuration = 200,
+                        LayoutEasing = Easing.OutQuint,
+                        ChildrenEnumerable = round.Beatmaps.Select(p => new RoundBeatmapRow(round, p))
+                    };
+                }
+
+                public void CreateNew()
+                {
+                    var user = new RoundBeatmap();
+                    round.Beatmaps.Add(user);
+                    flow.Add(new RoundBeatmapRow(round, user));
+                }
+
+                public class RoundBeatmapRow : CompositeDrawable
+                {
+                    private readonly RoundBeatmap beatmap;
+
+                    [Resolved]
+                    protected IAPIProvider API { get; private set; }
+
+                    private readonly Bindable<string> beatmapId = new Bindable<string>();
+
+                    private readonly Bindable<string> mods = new Bindable<string>();
+
+                    private readonly Container drawableContainer;
+
+                    public RoundBeatmapRow(TournamentRound team, RoundBeatmap beatmap)
+                    {
+                        this.beatmap = beatmap;
+
+                        Margin = new MarginPadding(10);
+
+                        RelativeSizeAxes = Axes.X;
+                        AutoSizeAxes = Axes.Y;
+
+                        Masking = true;
+                        CornerRadius = 5;
+
+                        InternalChildren = new Drawable[]
+                        {
+                            new Box
+                            {
+                                Colour = OsuColour.Gray(0.2f),
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            new FillFlowContainer
+                            {
+                                Margin = new MarginPadding(5),
+                                Padding = new MarginPadding { Right = 160 },
+                                Spacing = new Vector2(5),
+                                Direction = FillDirection.Horizontal,
+                                AutoSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new SettingsTextBox
+                                    {
+                                        LabelText = "Beatmap ID",
+                                        RelativeSizeAxes = Axes.None,
+                                        Width = 200,
+                                        Bindable = beatmapId,
+                                    },
+                                    new SettingsTextBox
+                                    {
+                                        LabelText = "Mods",
+                                        RelativeSizeAxes = Axes.None,
+                                        Width = 200,
+                                        Bindable = mods,
+                                    },
+                                    drawableContainer = new Container
+                                    {
+                                        Size = new Vector2(100, 70),
+                                    },
+                                }
+                            },
+                            new DangerousSettingsButton
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                RelativeSizeAxes = Axes.None,
+                                Width = 150,
+                                Text = "Delete Beatmap",
+                                Action = () =>
+                                {
+                                    Expire();
+                                    team.Beatmaps.Remove(beatmap);
+                                },
+                            }
+                        };
+                    }
+
+                    [BackgroundDependencyLoader]
+                    private void load(RulesetStore rulesets)
+                    {
+                        beatmapId.Value = beatmap.ID.ToString();
+                        beatmapId.BindValueChanged(idString =>
+                        {
+                            int parsed;
+
+                            int.TryParse(idString.NewValue, out parsed);
+
+                            beatmap.ID = parsed;
+
+                            if (idString.NewValue != idString.OldValue)
+                                beatmap.BeatmapInfo = null;
+
+                            if (beatmap.BeatmapInfo != null)
+                            {
+                                updatePanel();
+                                return;
+                            }
+
+                            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = beatmap.ID });
+
+                            req.Success += res =>
+                            {
+                                beatmap.BeatmapInfo = res.ToBeatmap(rulesets);
+                                updatePanel();
+                            };
+
+                            req.Failure += _ =>
+                            {
+                                beatmap.BeatmapInfo = null;
+                                updatePanel();
+                            };
+
+                            API.Queue(req);
+                        }, true);
+
+                        mods.Value = beatmap.Mods;
+                        mods.BindValueChanged(modString => beatmap.Mods = modString.NewValue);
+                    }
+
+                    private void updatePanel()
+                    {
+                        drawableContainer.Clear();
+
+                        if (beatmap.BeatmapInfo != null)
+                            drawableContainer.Child = new TournamentBeatmapPanel(beatmap.BeatmapInfo, beatmap.Mods)
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Width = 300
+                            };
+                    }
+                }
+            }
         }
     }
 }

osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs

@@ -102,7 +102,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Width = 0.11f,
                                 Margin = new MarginPadding(10),
                                 Text = "Add player",
-                                Action = () => playerEditor.AddUser()
+                                Action = () => playerEditor.CreateNew()
                             },
                             new DangerousSettingsButton
                             {
@@ -167,7 +167,7 @@ namespace osu.Game.Tournament.Screens.Editors
                     };
                 }
 
-                public void AddUser()
+                public void CreateNew()
                 {
                     var user = new User();
                     team.Players.Add(user);