h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 17:43:05 +08:00
Code Issues Releases Wiki Activity

Merge pull request #15771 from peppy/ruleset-config-cache-shortname

Browse Source 
Update `RulesetConfigCache` to cache via `ShortName` instead of `ID`
This commit is contained in:
Dan Balasescu 2021-11-24 15:24:57 +09:00 committed by GitHub
commit 33d95fbb9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Rulesets/RulesetConfigCache.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets
private readonly RealmContextFactory realmFactory; private readonly RealmContextFactory realmFactory;
private readonly RulesetStore rulesets; private readonly RulesetStore rulesets;
private readonly Dictionary<int, IRulesetConfigManager> configCache = new Dictionary<int, IRulesetConfigManager>(); private readonly Dictionary<string, IRulesetConfigManager> configCache = new Dictionary<string, IRulesetConfigManager>();
public RulesetConfigCache(RealmContextFactory realmFactory, RulesetStore rulesets) public RulesetConfigCache(RealmContextFactory realmFactory, RulesetStore rulesets)
{ {
@ -36,10 +36,10 @@ namespace osu.Game.Rulesets
// let's keep things simple for now and just retrieve all the required configs at startup.. // let's keep things simple for now and just retrieve all the required configs at startup..
foreach (var ruleset in rulesets.AvailableRulesets) foreach (var ruleset in rulesets.AvailableRulesets)
{ {
if (ruleset.ID == null) if (string.IsNullOrEmpty(ruleset.ShortName))
continue; continue;
configCache[ruleset.ID.Value] = ruleset.CreateInstance().CreateConfig(settingsStore); configCache[ruleset.ShortName] = ruleset.CreateInstance().CreateConfig(settingsStore);
} }
} }
@ -51,10 +51,7 @@ namespace osu.Game.Rulesets
/// <exception cref="InvalidOperationException">If <paramref name="ruleset"/> doesn't have a valid <see cref="RulesetInfo.ID"/>.</exception> /// <exception cref="InvalidOperationException">If <paramref name="ruleset"/> doesn't have a valid <see cref="RulesetInfo.ID"/>.</exception>
public IRulesetConfigManager GetConfigFor(Ruleset ruleset) public IRulesetConfigManager GetConfigFor(Ruleset ruleset)
{ {
if (ruleset.RulesetInfo.ID == null) if (!configCache.TryGetValue(ruleset.RulesetInfo.ShortName, out var config))
return null;
if (!configCache.TryGetValue(ruleset.RulesetInfo.ID.Value, out var config))
// any ruleset request which wasn't initialised on startup should not be stored to realm. // any ruleset request which wasn't initialised on startup should not be stored to realm.
// this should only be used by tests. // this should only be used by tests.
return ruleset.CreateConfig(null); return ruleset.CreateConfig(null);