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

Sanitise mods / statistics cache logic in ScoreInfo

Browse Source
This commit is contained in:
Dean Herbert 2022-01-13 12:59:16 +09:00
parent 1a29098f3b
commit 65dd80e6f6
1 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
osu.Game/Scoring/ScoreInfo.cs
View File

@ -46,6 +46,12 @@ namespace osu.Game.Scoring
[MapTo("User")]
public RealmUser RealmUser { get; set; } = new RealmUser();
[MapTo("Mods")]
public string ModsJson { get; set; } = string.Empty;
[MapTo("Statistics")]
public string StatisticsJson { get; set; } = string.Empty;
public ScoreInfo(BeatmapInfo beatmap, RulesetInfo ruleset, RealmUser realmUser)
{
Ruleset = ruleset;
@ -98,27 +104,6 @@ namespace osu.Game.Scoring
public RulesetInfo Ruleset { get; set; } = null!;
private Dictionary<HitResult, int>? statistics;
[Ignored]
public Dictionary<HitResult, int> Statistics
{
get
{
if (statistics != null)
return statistics;
if (!string.IsNullOrEmpty(StatisticsJson))
statistics = JsonConvert.DeserializeObject<Dictionary<HitResult, int>>(StatisticsJson);
return statistics ??= new Dictionary<HitResult, int>();
}
set => statistics = value;
}
[MapTo("Statistics")]
public string StatisticsJson { get; set; } = null!;
public ScoreRank Rank
{
get => (ScoreRank)RankInt;
@ -135,10 +120,6 @@ namespace osu.Game.Scoring
#region Properties required to make things work with existing usages
private APIMod[]? localAPIMods;
private Mod[]? mods;
public Guid BeatmapInfoID => BeatmapInfo.ID;
public int UserID => RealmUser.OnlineID;
@ -177,61 +158,83 @@ namespace osu.Game.Scoring
[Ignored]
public bool IsLegacyScore => Mods.OfType<ModClassic>().Any();
// Used for database serialisation/deserialisation.
[MapTo("Mods")]
public string ModsJson { get; set; } = string.Empty;
private Dictionary<HitResult, int>? statistics;
[Ignored]
public Dictionary<HitResult, int> Statistics
{
get
{
if (statistics != null)
return statistics;
if (!string.IsNullOrEmpty(StatisticsJson))
statistics = JsonConvert.DeserializeObject<Dictionary<HitResult, int>>(StatisticsJson);
return statistics ??= new Dictionary<HitResult, int>();
}
set => statistics = value;
}
private Mod[]? mods;
[Ignored]
public Mod[] Mods
{
get
{
Mod[] scoreMods = Array.Empty<Mod>();
if (mods != null)
scoreMods = mods;
else if (localAPIMods != null)
scoreMods = APIMods.Select(m => m.ToMod(Ruleset.CreateInstance())).ToArray();
return mods;
return scoreMods;
if (apiMods != null)
return APIMods.Select(m => m.ToMod(Ruleset.CreateInstance())).ToArray();
return Array.Empty<Mod>();
}
set
{
localAPIMods = null;
apiMods = null;
mods = value;
ModsJson = JsonConvert.SerializeObject(APIMods);
updateModsJson();
}
}
private APIMod[]? apiMods;
// Used for API serialisation/deserialisation.
[Ignored]
public APIMod[] APIMods
{
get
{
if (localAPIMods == null)
{
if (apiMods != null) return apiMods;
// prioritise reading from realm backing
if (!string.IsNullOrEmpty(ModsJson))
localAPIMods = JsonConvert.DeserializeObject<APIMod[]>(ModsJson);
apiMods = JsonConvert.DeserializeObject<APIMod[]>(ModsJson);
// then check mods set via Mods property.
if (mods != null)
localAPIMods = mods.Select(m => new APIMod(m)).ToArray();
}
apiMods = mods.Select(m => new APIMod(m)).ToArray();
return localAPIMods ?? Array.Empty<APIMod>();
return apiMods ?? Array.Empty<APIMod>();
}
set
{
localAPIMods = value;
apiMods = value;
mods = null;
// We potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
mods = null;
ModsJson = JsonConvert.SerializeObject(APIMods);
updateModsJson();
}
}
private void updateModsJson()
{
ModsJson = JsonConvert.SerializeObject(APIMods);
}
public IEnumerable<HitResultDisplayStatistic> GetStatisticsForDisplay()
{
foreach (var r in Ruleset.CreateInstance().GetHitResults())