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

Refactors/renames

Browse Source
This commit is contained in:
Dean Herbert
2018-11-30 16:11:09 +09:00
parent 831cd3ed59
commit 3727955911
11 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Scoring/Legacy/LegacyScoreParser.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Scoring.Legacy
throw new BeatmapNotFoundException();
currentBeatmap = workingBeatmap.Beatmap;
score.ScoreInfo.BeatmapInfo = currentBeatmap.BeatmapInfo;
score.ScoreInfo.Beatmap = currentBeatmap.BeatmapInfo;
score.ScoreInfo.User = score.Replay.User = new User { Username = sr.ReadString() };
score.ScoreInfo.MD5Hash = sr.ReadString();

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

@ -36,27 +36,49 @@ namespace osu.Game.Scoring
public int RulesetID { get; set; }
public RulesetInfo Ruleset { get; set; }
public virtual RulesetInfo Ruleset { get; set; }
[NotMapped, JsonIgnore]
private Mod[] mods;
[NotMapped]
public Mod[] Mods
{
get
{
if (ModsString == null)
if (mods != null) return mods;
if (modsJson == null)
return Array.Empty<Mod>();
var deserialized = JsonConvert.DeserializeObject<string[]>(ModsString);
return Ruleset.CreateInstance().GetAllMods().Where(mod => deserialized.Any(d => d == mod.ShortenedName)).ToArray();
return getModsFromRuleset(JsonConvert.DeserializeObject<DeserializedMod[]>(modsJson));
}
set
{
mods = value;
ModsJson = null;
}
set => ModsString = JsonConvert.SerializeObject(value.Select(m => m.ShortenedName).ToArray());
}
public string ModsString { get; set; }
private Mod[] getModsFromRuleset(DeserializedMod[] mods) => Ruleset.CreateInstance().GetAllMods().Where(mod => mods.Any(d => d.ShortenedName == mod.ShortenedName)).ToArray();
private string modsJson;
[Column("Mods")]
public string ModsJson
{
get => modsJson ?? JsonConvert.SerializeObject(Mods);
set
{
modsJson = value;
// we potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
mods = null;
}
}
[NotMapped, JsonIgnore]
public User User;
[Column("User")]
public string UserString
{
get => User?.Username;
@ -65,22 +87,25 @@ namespace osu.Game.Scoring
public int BeatmapInfoID { get; set; }
public BeatmapInfo BeatmapInfo { get; set; }
public virtual BeatmapInfo Beatmap { get; set; }
public long? OnlineScoreID { get; set; }
public DateTimeOffset Date { get; set; }
[NotMapped, JsonIgnore]
public Dictionary<HitResult, object> Statistics = new Dictionary<HitResult, object>();
public string StatisticsString
[Column("Statistics")]
public string StatisticsJson
{
get => JsonConvert.SerializeObject(Statistics);
set
{
if (value == null)
{
Statistics.Clear();
return;
}
Statistics = JsonConvert.DeserializeObject<Dictionary<HitResult, object>>(value);
}
@ -95,5 +120,13 @@ namespace osu.Game.Scoring
public List<ScoreFileInfo> Files { get; set; }
public bool DeletePending { get; set; }
[Serializable]
protected class DeserializedMod : Mod
{
public override string Name { get; } = string.Empty;
public override string ShortenedName { get; } = string.Empty;
public override double ScoreMultiplier { get; } = 0;
}
}
}

2
osu.Game/Scoring/ScoreStore.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Scoring
protected override IQueryable<ScoreInfo> AddIncludesForConsumption(IQueryable<ScoreInfo> query)
=> base.AddIncludesForConsumption(query)
.Include(s => s.Files).ThenInclude(f => f.FileInfo)
.Include(s => s.BeatmapInfo)
.Include(s => s.Beatmap)
.Include(s => s.Ruleset);
}
}