From 3550e5b30f93d965265bbf4ab611a588753a23b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Dec 2020 16:42:06 +0900
Subject: [PATCH] Add length display to room screen as well

---
 .../Online/API/Requests/Responses/APIBeatmap.cs  |  1 +
 .../Online/Multiplayer/PlaylistExtensions.cs     | 16 ++++++++++++++++
 .../Match/Components/MatchSettingsOverlay.cs     |  9 ++-------
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs   |  5 ++++-
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/PlaylistExtensions.cs

diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index ae65ac09b2..7343870dbc 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -75,6 +75,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 StarDifficulty = starDifficulty,
                 OnlineBeatmapID = OnlineBeatmapID,
                 Version = version,
+                // this is actually an incorrect mapping (Length is calculated as drain length in lazer's import process, see BeatmapManager.calculateLength).
                 Length = TimeSpan.FromSeconds(length).TotalMilliseconds,
                 Status = Status,
                 BeatmapSet = set,
diff --git a/osu.Game/Online/Multiplayer/PlaylistExtensions.cs b/osu.Game/Online/Multiplayer/PlaylistExtensions.cs
new file mode 100644
index 0000000000..fe3d96e295
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/PlaylistExtensions.cs
@@ -0,0 +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.Linq;
+using Humanizer;
+using Humanizer.Localisation;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Online.Multiplayer
+{
+    public static class PlaylistExtensions
+    {
+        public static string GetTotalDuration(this BindableList<PlaylistItem> playlist) =>
+            playlist.Select(p => p.Beatmap.Value.Length).Sum().Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2);
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 8bf66b084c..668a373d80 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Specialized;
-using System.Linq;
 using Humanizer;
-using Humanizer.Localisation;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -339,11 +337,8 @@ namespace osu.Game.Screens.Multi.Match.Components
                 ApplyButton.Enabled.Value = hasValidSettings;
             }
 
-            private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
-            {
-                double totalLength = Playlist.Select(p => p.Beatmap.Value.Length).Sum();
-                playlistLength.Text = $"Length: {totalLength.Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2)}";
-            }
+            private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
+                playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
 
             private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;
 
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 2cbe215a39..13a5d89a12 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Screens.Multi.Match
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private OverlinedHeader participantsHeader;
+        private OverlinedHeader playlistHeader;
 
         public MatchSubScreen(Room room)
         {
@@ -135,7 +136,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Content = new[]
                                                                 {
-                                                                    new Drawable[] { new OverlinedHeader("Playlist"), },
+                                                                    new Drawable[] { playlistHeader = new OverlinedHeader("Playlist"), },
                                                                     new Drawable[]
                                                                     {
                                                                         new DrawableRoomPlaylistWithResults
@@ -243,6 +244,8 @@ namespace osu.Game.Screens.Multi.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
+
+            playlist.BindCollectionChanged((_, __) => playlistHeader.Details.Value = playlist.GetTotalDuration(), true);
         }
 
         public override bool OnExiting(IScreen next)