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

Rename and refactor token request process to be easier to understand

Browse Source
This commit is contained in:
Dean Herbert 2021-03-24 13:17:13 +09:00
parent e372e355ef
commit a0c6c4da35
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/Play/SubmittingPlayer.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Screens; using osu.Framework.Screens;
@ -37,7 +38,7 @@ namespace osu.Game.Screens.Play
if (!api.IsLoggedIn) if (!api.IsLoggedIn)
{ {
fail(new InvalidOperationException("API is not online.")); handleFailure(new InvalidOperationException("API is not online."));
return; return;
} }
@ -45,7 +46,7 @@ namespace osu.Game.Screens.Play
if (req == null) if (req == null)
{ {
fail(new InvalidOperationException("Request could not be constructed.")); handleFailure(new InvalidOperationException("Request could not be constructed."));
return; return;
} }
@ -54,13 +55,13 @@ namespace osu.Game.Screens.Play
Token = r.ID; Token = r.ID;
tcs.SetResult(true); tcs.SetResult(true);
}; };
req.Failure += fail; req.Failure += handleFailure;
api.Queue(req); api.Queue(req);
tcs.Task.Wait(); tcs.Task.Wait();
void fail(Exception exception) void handleFailure(Exception exception)
{ {
if (HandleTokenRetrievalFailure(exception)) if (HandleTokenRetrievalFailure(exception))
{ {
@ -116,8 +117,19 @@ namespace osu.Game.Screens.Play
await tcs.Task.ConfigureAwait(false); await tcs.Task.ConfigureAwait(false);
} }
protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token); /// <summary>
/// Construct a request to be used for retrieval of the score token.
/// Can return null, at which point <see cref="HandleTokenRetrievalFailure"/> will be fired.
/// </summary>
[CanBeNull]
protected abstract APIRequest<APIScoreToken> CreateTokenRequest(); protected abstract APIRequest<APIScoreToken> CreateTokenRequest();
/// <summary>
/// Construct a request to submit the score.
/// Will only be invoked if the request constructed via <see cref="CreateTokenRequest"/> was successful.
/// </summary>
/// <param name="score">The score to be submitted.</param>
/// <param name="token">The submission token.</param>
protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
} }
} }