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

Make ruleset id non-nullable

This commit is contained in:
Dean Herbert 2021-09-15 17:01:31 +09:00
parent 80ecf81be3
commit dcfe9c67e3
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Configuration/RealmRulesetSetting.cs
View File

@ -13,7 +13,8 @@ public class RealmRulesetSetting : RealmObject, IHasGuidPrimaryKey
[PrimaryKey]
public Guid ID { get; set; } = Guid.NewGuid();
public int? RulesetID { get; set; }
[Indexed]
public int RulesetID { get; set; }
public int? Variant { get; set; }

4
osu.Game/OsuGameBase.cs
View File

@ -458,11 +458,13 @@ private void migrateDataToRealm()
{
foreach (var dkb in existingSettings)
{
if (dkb.RulesetID == null) continue;
usage.Realm.Add(new RealmRulesetSetting
{
ValueString = dkb.StringValue,
Key = dkb.Key,
RulesetID = dkb.RulesetID,
RulesetID = dkb.RulesetID.Value,
Variant = dkb.Variant
});
}

15
osu.Game/Rulesets/Configuration/RulesetConfigManager.cs
View File

@ -20,12 +20,17 @@ public abstract class RulesetConfigManager<TLookup> : ConfigManager<TLookup>, IR
private List<RealmRulesetSetting> databasedSettings = new List<RealmRulesetSetting>();
private readonly RulesetInfo ruleset;
private readonly int rulesetId;
protected RulesetConfigManager(SettingsStore store, RulesetInfo ruleset, int? variant = null)
{
realmFactory = store?.Realm;
this.ruleset = ruleset;
if (realmFactory != null && !ruleset.ID.HasValue)
throw new InvalidOperationException("Attempted to add databased settings for a non-databased ruleset");
rulesetId = ruleset.ID ?? -1;
this.variant = variant;
Load();
@ -35,12 +40,10 @@ protected RulesetConfigManager(SettingsStore store, RulesetInfo ruleset, int? va
protected override void PerformLoad()
{
var rulesetID = ruleset?.ID;
if (realmFactory != null)
{
// As long as RulesetConfigCache exists, there is no need to subscribe to realm events.
databasedSettings = realmFactory.Context.All<RealmRulesetSetting>().Where(b => b.RulesetID == rulesetID && b.Variant == variant).ToList();
databasedSettings = realmFactory.Context.All<RealmRulesetSetting>().Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
}
}
@ -66,7 +69,7 @@ protected override void AddBindable<TBindable>(TLookup lookup, Bindable<TBindabl
{
Key = lookup.ToString(),
Value = bindable.Value,
RulesetID = ruleset?.ID,
RulesetID = rulesetId,
Variant = variant,
};