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

Combine and attempt to simplify the score import / preparation process further

Browse Source
This commit is contained in:
Dean Herbert 2023-02-14 16:55:35 +09:00
parent 8a206234f7
commit 7aaaf7fca2
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Rulesets/UI/RulesetInputManager.cs
View File

@ -39,6 +39,9 @@ namespace osu.Game.Rulesets.UI
{ {
set set
{ {
if (value == recorder)
return;
if (value != null && recorder != null) if (value != null && recorder != null)
throw new InvalidOperationException("Cannot attach more than one recorder"); throw new InvalidOperationException("Cannot attach more than one recorder");

82
osu.Game/Screens/Play/Player.cs
View File

@ -276,7 +276,7 @@ namespace osu.Game.Screens.Play
}, },
FailOverlay = new FailOverlay FailOverlay = new FailOverlay
{ {
SaveReplay = prepareAndImportScore, SaveReplay = async () => await prepareAndImportScoreAsync(true).ConfigureAwait(false),
OnRetry = () => Restart(), OnRetry = () => Restart(),
OnQuit = () => PerformExit(true), OnQuit = () => PerformExit(true),
}, },
@ -614,7 +614,7 @@ namespace osu.Game.Screens.Play
resultsDisplayDelegate?.Cancel(); resultsDisplayDelegate?.Cancel();
// import current score if possible. // import current score if possible.
attemptScoreImport(); prepareAndImportScoreAsync();
// The actual exit is performed if // The actual exit is performed if
// - the pause / fail dialog was not requested // - the pause / fail dialog was not requested
@ -772,10 +772,7 @@ namespace osu.Game.Screens.Play
if (prepareScoreForDisplayTask == null) if (prepareScoreForDisplayTask == null)
{ {
// Try importing score since the task hasn't been invoked yet. // Try importing score since the task hasn't been invoked yet.
if (!attemptScoreImport()) prepareAndImportScoreAsync();
// If attempt failed, trying again is unnecessary
resultsDisplayDelegate?.Cancel();
return; return;
} }
@ -785,6 +782,12 @@ namespace osu.Game.Screens.Play
resultsDisplayDelegate?.Cancel(); resultsDisplayDelegate?.Cancel();
if (prepareScoreForDisplayTask.GetResultSafely() == null)
{
// If score import did not occur, we do not want to show the results screen.
return;
}
if (!this.IsCurrentScreen()) if (!this.IsCurrentScreen())
// This player instance may already be in the process of exiting. // This player instance may already be in the process of exiting.
return; return;
@ -796,53 +799,48 @@ namespace osu.Game.Screens.Play
} }
/// <summary> /// <summary>
/// Attempts to run <see cref="prepareAndImportScore"/> /// Asynchronously run score preparation operations (database import, online submission etc.).
/// </summary> /// </summary>
/// <returns> /// <param name="forceImport">Whether the score should be imported even if non-passing (or the current configuration doesn't allow for it).</param>
/// Whether the attempt was successful /// <returns>The final score.</returns>
/// </returns> [ItemCanBeNull]
private bool attemptScoreImport() private Task<ScoreInfo> prepareAndImportScoreAsync(bool forceImport = false)
{ {
// Ensure we are not writing to the replay any more, as we are about to consume and store the score. // Ensure we are not writing to the replay any more, as we are about to consume and store the score.
DrawableRuleset.SetRecordTarget(null); DrawableRuleset.SetRecordTarget(null);
if (prepareScoreForDisplayTask != null)
return prepareScoreForDisplayTask;
// We do not want to import the score in cases where we don't show results // We do not want to import the score in cases where we don't show results
bool canShowResults = Configuration.ShowResults && ScoreProcessor.HasCompleted.Value && GameplayState.HasPassed; bool canShowResults = Configuration.ShowResults && ScoreProcessor.HasCompleted.Value && GameplayState.HasPassed;
if (!canShowResults) if (!canShowResults && !forceImport)
return false; return Task.FromResult<ScoreInfo>(null);
prepareScoreForDisplayTask ??= Task.Run(prepareAndImportScore); return prepareScoreForDisplayTask = Task.Run(async () =>
return true;
}
/// <summary>
/// Asynchronously run score preparation operations (database import, online submission etc.).
/// </summary>
/// <returns>The final score.</returns>
private async Task<ScoreInfo> prepareAndImportScore()
{
var scoreCopy = Score.DeepClone();
try
{ {
await PrepareScoreForResultsAsync(scoreCopy).ConfigureAwait(false); var scoreCopy = Score.DeepClone();
}
catch (Exception ex)
{
Logger.Error(ex, @"Score preparation failed!");
}
try try
{ {
await ImportScore(scoreCopy).ConfigureAwait(false); await PrepareScoreForResultsAsync(scoreCopy).ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Error(ex, @"Score import failed!"); Logger.Error(ex, @"Score preparation failed!");
} }
return scoreCopy.ScoreInfo; try
{
await ImportScore(scoreCopy).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.Error(ex, @"Score import failed!");
}
return scoreCopy.ScoreInfo;
});
} }
protected override bool OnScroll(ScrollEvent e) protected override bool OnScroll(ScrollEvent e)