sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add cancellation support for API requests.

Browse Source
This commit is contained in:
Dean Herbert
2017-03-15 18:07:26 +09:00
parent 08e93275fa
commit 1855f48997
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Online/API/APIRequest.cs
View File

@ -58,8 +58,12 @@ namespace osu.Game.Online.API
public event APISuccessHandler Success;
public event APIFailureHandler Failure;
private bool cancelled;
public void Perform(APIAccess api)
{
if (cancelled) return;
if (startTime == null)
startTime = DateTime.Now.TotalMilliseconds();
@ -74,11 +78,16 @@ namespace osu.Game.Online.API
WebRequest.BlockingPerform();
api.Scheduler.Add(delegate { Success?.Invoke(); });
if (WebRequest.Completed)
api.Scheduler.Add(delegate { Success?.Invoke(); });
}
public void Cancel() => Fail(new OperationCanceledException(@"Request cancelled"));
public void Fail(Exception e)
{
cancelled = true;
WebRequest?.Abort();
api.Scheduler.Add(delegate
{