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

Clean up completion handling

Browse Source
This commit is contained in:
Dan Balasescu 2025-02-25 23:17:02 +09:00
parent 116b5a335a
commit bb457ca8e2
No known key found for this signature in database
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
osu.Game/Screens/Ranking/ResultsScreen.cs
View File

@ -10,7 +10,6 @@ using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Audio.Sample; using osu.Framework.Audio.Sample;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -66,7 +65,7 @@ namespace osu.Game.Screens.Ranking
private Drawable bottomPanel = null!; private Drawable bottomPanel = null!;
private Container<ScorePanel> detachedPanelContainer = null!; private Container<ScorePanel> detachedPanelContainer = null!;
private bool lastFetchCompleted; private Task lastFetchTask = Task.CompletedTask;
/// <summary> /// <summary>
/// Whether the user can retry the beatmap from the results screen. /// Whether the user can retry the beatmap from the results screen.
@ -235,7 +234,7 @@ namespace osu.Game.Screens.Ranking
{ {
base.LoadComplete(); base.LoadComplete();
FetchScores().ContinueWith(t => addScores(t.GetResultSafely())); lastFetchTask = Task.Run(async () => await addScores(await FetchScores().ConfigureAwait(false)).ConfigureAwait(false));
StatisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true); StatisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
} }
@ -244,18 +243,17 @@ namespace osu.Game.Screens.Ranking
{ {
base.Update(); base.Update();
if (lastFetchCompleted) if (lastFetchTask.IsCompleted)
{ {
Task<ScoreInfo[]> nextPageTask = Task.FromResult<ScoreInfo[]>([]); Task<ScoreInfo[]>? nextPageTask = null;
if (ScorePanelList.IsScrolledToStart) if (ScorePanelList.IsScrolledToStart)
nextPageTask = FetchNextPage(-1); nextPageTask = FetchNextPage(-1);
else if (ScorePanelList.IsScrolledToEnd) else if (ScorePanelList.IsScrolledToEnd)
nextPageTask = FetchNextPage(1); nextPageTask = FetchNextPage(1);
nextPageTask.ContinueWith(t => addScores(t.GetResultSafely()), TaskContinuationOptions.OnlyOnRanToCompletion); if (nextPageTask != null)
lastFetchTask = Task.Run(async () => await addScores(await nextPageTask).ConfigureAwait(false));
lastFetchCompleted = nextPageTask.IsCompletedSuccessfully;
} }
} }
@ -340,26 +338,33 @@ namespace osu.Game.Screens.Ranking
: new StatisticsPanel(); : new StatisticsPanel();
} }
private void addScores(ScoreInfo[] scores) => Schedule(() => private Task addScores(ScoreInfo[] scores)
{ {
foreach (var s in scores) var tcs = new TaskCompletionSource();
Schedule(() =>
{ {
var panel = ScorePanelList.AddScore(s); foreach (var s in scores)
if (detachedPanel != null) {
panel.Alpha = 0; var panel = ScorePanelList.AddScore(s);
} if (detachedPanel != null)
panel.Alpha = 0;
}
// allow a frame for scroll container to adjust its dimensions with the added scores before fetching again. // allow a frame for scroll container to adjust its dimensions with the added scores before fetching again.
Schedule(() => lastFetchCompleted = true); Schedule(() => tcs.SetResult());
if (ScorePanelList.IsEmpty) if (ScorePanelList.IsEmpty)
{ {
// This can happen if for example a beatmap that is part of a playlist hasn't been played yet. // This can happen if for example a beatmap that is part of a playlist hasn't been played yet.
VerticalScrollContent.Add(new MessagePlaceholder(LeaderboardStrings.NoRecordsYet)); VerticalScrollContent.Add(new MessagePlaceholder(LeaderboardStrings.NoRecordsYet));
} }
OnScoresAdded(scores); OnScoresAdded(scores);
}); });
return tcs.Task;
}
/// <summary> /// <summary>
/// Invoked after online scores are fetched and added to the list. /// Invoked after online scores are fetched and added to the list.