RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-18 21:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'score-stats-updates' into score-stats-display

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-12-24 13:56:10 +01:00
commit e961af20cc
No known key found for this signature in database
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Online/Solo/SoloStatisticsWatcher.cs
View File

@ -3,11 +3,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.ObjectExtensions; using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Extensions;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
@ -31,7 +31,7 @@ namespace osu.Game.Online.Solo
private readonly Dictionary<long, StatisticsUpdateCallback> callbacks = new Dictionary<long, StatisticsUpdateCallback>(); private readonly Dictionary<long, StatisticsUpdateCallback> callbacks = new Dictionary<long, StatisticsUpdateCallback>();
private long? lastProcessedScoreId; private long? lastProcessedScoreId;
private readonly Dictionary<string, UserStatistics> latestStatistics = new Dictionary<string, UserStatistics>(); private Dictionary<string, UserStatistics>? latestStatistics;
protected override void LoadComplete() protected override void LoadComplete()
{ {
@ -51,6 +51,9 @@ namespace osu.Game.Online.Solo
if (!api.IsLoggedIn) if (!api.IsLoggedIn)
return; return;
if (!score.Ruleset.IsLegacyRuleset())
return;
var callback = new StatisticsUpdateCallback(score, onUpdateReady); var callback = new StatisticsUpdateCallback(score, onUpdateReady);
if (lastProcessedScoreId == score.OnlineID) if (lastProcessedScoreId == score.OnlineID)
@ -59,23 +62,22 @@ namespace osu.Game.Online.Solo
return; return;
} }
callbacks[score.OnlineID] = callback; callbacks.Add(score.OnlineID, callback);
}); });
private void onUserChanged(APIUser? localUser) => Schedule(() => private void onUserChanged(APIUser? localUser) => Schedule(() =>
{ {
callbacks.Clear(); callbacks.Clear();
lastProcessedScoreId = null; lastProcessedScoreId = null;
latestStatistics.Clear(); latestStatistics = null;
if (!api.IsLoggedIn) if (localUser == null || localUser.OnlineID <= 1)
return; return;
Debug.Assert(localUser != null);
var userRequest = new GetUsersRequest(new[] { localUser.OnlineID }); var userRequest = new GetUsersRequest(new[] { localUser.OnlineID });
userRequest.Success += response => Schedule(() => userRequest.Success += response => Schedule(() =>
{ {
latestStatistics = new Dictionary<string, UserStatistics>();
foreach (var rulesetStats in response.Users.Single().RulesetsStatistics) foreach (var rulesetStats in response.Users.Single().RulesetsStatistics)
latestStatistics.Add(rulesetStats.Key, rulesetStats.Value); latestStatistics.Add(rulesetStats.Key, rulesetStats.Value);
}); });
@ -107,9 +109,12 @@ namespace osu.Game.Online.Solo
{ {
string rulesetName = callback.Score.Ruleset.ShortName; string rulesetName = callback.Score.Ruleset.ShortName;
if (!latestStatistics.TryGetValue(rulesetName, out var latestRulesetStatistics)) if (latestStatistics == null)
return; return;
latestStatistics.TryGetValue(rulesetName, out UserStatistics? latestRulesetStatistics);
latestRulesetStatistics ??= new UserStatistics();
var update = new SoloStatisticsUpdate(callback.Score, latestRulesetStatistics, updatedStatistics); var update = new SoloStatisticsUpdate(callback.Score, latestRulesetStatistics, updatedStatistics);
callback.OnUpdateReady.Invoke(update); callback.OnUpdateReady.Invoke(update);