h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:03:08 +08:00
Code Issues Releases Wiki Activity

Delay online fetch of non-current playlist item on room join

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-11-27 13:39:09 +01:00 committed by Dean Herbert
parent 01bc330d1c
commit 23dd21339d
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -139,7 +139,7 @@ namespace osu.Game.Online.Multiplayer
Debug.Assert(joinedRoom != null);
// Populate playlist items.
var playlistItems = await Task.WhenAll(joinedRoom.Playlist.Select(createPlaylistItem)).ConfigureAwait(false);
var playlistItems = await Task.WhenAll(joinedRoom.Playlist.Select(item => createPlaylistItem(item, item.ID == joinedRoom.Settings.PlaylistItemId))).ConfigureAwait(false);
// Populate users.
Debug.Assert(joinedRoom.Users != null);
@ -605,7 +605,7 @@ namespace osu.Game.Online.Multiplayer
if (Room == null)
return;
var playlistItem = await createPlaylistItem(item).ConfigureAwait(false);
var playlistItem = await createPlaylistItem(item, true).ConfigureAwait(false);
Scheduler.Add(() =>
{
@ -647,7 +647,7 @@ namespace osu.Game.Online.Multiplayer
if (Room == null)
return;
var playlistItem = await createPlaylistItem(item).ConfigureAwait(false);
var playlistItem = await createPlaylistItem(item, true).ConfigureAwait(false);
Scheduler.Add(() =>
{
@ -700,10 +700,8 @@ namespace osu.Game.Online.Multiplayer
CurrentMatchPlayingItem.Value = APIRoom.Playlist.SingleOrDefault(p => p.ID == settings.PlaylistItemId);
}
private async Task<PlaylistItem> createPlaylistItem(MultiplayerPlaylistItem item)
private async Task<PlaylistItem> createPlaylistItem(MultiplayerPlaylistItem item, bool populateImmediately)
{
var apiBeatmap = await GetAPIBeatmap(item.BeatmapID).ConfigureAwait(false);
var ruleset = Rulesets.GetRuleset(item.RulesetID);
var rulesetInstance = ruleset.CreateInstance();
@ -711,7 +709,6 @@ namespace osu.Game.Online.Multiplayer
{
ID = item.ID,
OwnerID = item.OwnerID,
Beatmap = { Value = apiBeatmap },
Ruleset = { Value = ruleset },
Expired = item.Expired
};
@ -719,9 +716,25 @@ namespace osu.Game.Online.Multiplayer
playlistItem.RequiredMods.AddRange(item.RequiredMods.Select(m => m.ToMod(rulesetInstance)));
playlistItem.AllowedMods.AddRange(item.AllowedMods.Select(m => m.ToMod(rulesetInstance)));
if (populateImmediately)
{
await populateFromOnline(item, playlistItem).ConfigureAwait(false);
}
else
{
// to avoid blocking other operations (like the initial room join), schedule online population to happen in the background.
// ReSharper disable once AsyncVoidLambda
Schedule(async () => await populateFromOnline(item, playlistItem).ConfigureAwait(false));
}
return playlistItem;
}
private async Task populateFromOnline(MultiplayerPlaylistItem item, PlaylistItem playlistItem)
{
playlistItem.Beatmap.Value = await GetAPIBeatmap(item.BeatmapID).ConfigureAwait(false);
}
/// <summary>
/// Retrieves a <see cref="APIBeatmap"/> from an online source.
/// </summary>