h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 16:37:26 +08:00
Code Issues Releases Wiki Activity

Use method instead of property for realm query retrieval

Browse Source
This commit is contained in:
Dean Herbert 2022-01-23 18:01:39 +09:00
parent 70a120ea8a
commit bd0eda7e90
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
View File

@ -46,19 +46,16 @@ namespace osu.Game.Input.Bindings
throw new InvalidOperationException($"{nameof(variant)} can not be null when a non-null {nameof(ruleset)} is provided."); throw new InvalidOperationException($"{nameof(variant)} can not be null when a non-null {nameof(ruleset)} is provided.");
} }
private IQueryable<RealmKeyBinding> realmKeyBindings private IQueryable<RealmKeyBinding> queryRealmKeyBindings()
{ {
get string rulesetName = ruleset?.ShortName;
{ return realmFactory.Context.All<RealmKeyBinding>()
string rulesetName = ruleset?.ShortName; .Where(b => b.RulesetName == rulesetName && b.Variant == variant);
return realmFactory.Context.All<RealmKeyBinding>()
.Where(b => b.RulesetName == rulesetName && b.Variant == variant);
}
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
realmSubscription = realmFactory.Register(realm => realmKeyBindings realmSubscription = realmFactory.Register(realm => queryRealmKeyBindings()
.QueryAsyncWithNotifications((sender, changes, error) => .QueryAsyncWithNotifications((sender, changes, error) =>
{ {
// The first fire of this is a bit redundant as this is being called in base.LoadComplete, // The first fire of this is a bit redundant as this is being called in base.LoadComplete,
@ -80,11 +77,11 @@ namespace osu.Game.Input.Bindings
{ {
var defaults = DefaultKeyBindings.ToList(); var defaults = DefaultKeyBindings.ToList();
List<RealmKeyBinding> newBindings = realmKeyBindings.Detach() List<RealmKeyBinding> newBindings = queryRealmKeyBindings().Detach()
// this ordering is important to ensure that we read entries from the database in the order // this ordering is important to ensure that we read entries from the database in the order
// enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise // enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
// have been eaten by the music controller due to query order. // have been eaten by the music controller due to query order.
.OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.ActionInt)).ToList(); .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.ActionInt)).ToList();
// In the case no bindings were found in the database, presume this usage is for a non-databased ruleset. // In the case no bindings were found in the database, presume this usage is for a non-databased ruleset.
// This actually should never be required and can be removed if it is ever deemed to cause a problem. // This actually should never be required and can be removed if it is ever deemed to cause a problem.