RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move bulk of method into separate private method with minor clean-ups

This commit is contained in:
Dean Herbert 2018-12-14 15:48:34 +09:00
parent a1543905ae
commit 9072af9792
1 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
osu.Game/Online/API/APIAccess.cs
View File

@ -196,52 +196,13 @@ public void Login(string username, string password)
/// <returns>true if we should remove this request from the queue.</returns> /// <returns>true if we should remove this request from the queue.</returns>
private bool handleRequest(APIRequest req) private bool handleRequest(APIRequest req)
{ {
bool handleWebException(WebException we)
{
HttpStatusCode statusCode = (we.Response as HttpWebResponse)?.StatusCode
?? (we.Status == WebExceptionStatus.UnknownError ? HttpStatusCode.NotAcceptable : HttpStatusCode.RequestTimeout);
// special cases for un-typed but useful message responses.
switch (we.Message)
{
case "Unauthorized":
case "Forbidden":
statusCode = HttpStatusCode.Unauthorized;
break;
}
switch (statusCode)
{
case HttpStatusCode.Unauthorized:
Logout(false);
return true;
case HttpStatusCode.RequestTimeout:
failureCount++;
log.Add($@"API failure count is now {failureCount}");
if (failureCount < 3)
//we might try again at an api level.
return false;
State = APIState.Failing;
flushQueue();
return true;
}
return true;
}
try try
{ {
Logger.Log($@"Performing request {req}", LoggingTarget.Network); Logger.Log($@"Performing request {req}", LoggingTarget.Network);
req.Failure += ex => req.Failure += ex =>
{ {
switch (ex) if (ex is WebException we)
{
case WebException we:
handleWebException(we); handleWebException(we);
break;
}
}; };
req.Perform(this); req.Perform(this);
@ -296,6 +257,41 @@ private set
} }
} }
private bool handleWebException(WebException we)
{
HttpStatusCode statusCode = (we.Response as HttpWebResponse)?.StatusCode
?? (we.Status == WebExceptionStatus.UnknownError ? HttpStatusCode.NotAcceptable : HttpStatusCode.RequestTimeout);
// special cases for un-typed but useful message responses.
switch (we.Message)
{
case "Unauthorized":
case "Forbidden":
statusCode = HttpStatusCode.Unauthorized;
break;
}
switch (statusCode)
{
case HttpStatusCode.Unauthorized:
Logout(false);
return true;
case HttpStatusCode.RequestTimeout:
failureCount++;
log.Add($@"API failure count is now {failureCount}");
if (failureCount < 3)
//we might try again at an api level.
return false;
State = APIState.Failing;
flushQueue();
return true;
}
return true;
}
public bool IsLoggedIn => LocalUser.Value.Id > 1; public bool IsLoggedIn => LocalUser.Value.Id > 1;
public void Queue(APIRequest request) public void Queue(APIRequest request)