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

Add and consume IKeyBindingStore interface

Browse Source
This commit is contained in:
Dean Herbert
2021-01-07 16:38:49 +09:00
parent a9a3a95991
commit 43f417b53a
9 changed files with 80 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Input/RealmKeyBindingStore.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Rulesets;
namespace osu.Game.Input
{
public class RealmKeyBindingStore : RealmBackedStore
public class RealmKeyBindingStore : RealmBackedStore, IKeyBindingStore
{
public event Action KeyBindingChanged;
@ -37,7 +37,7 @@ namespace osu.Game.Input
/// <returns>A set of display strings for all the user's key configuration for the action.</returns>
public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction globalAction)
{
foreach (var action in Query().Where(b => (GlobalAction)b.KeyBinding.Action == globalAction))
foreach (var action in query().Where(b => (GlobalAction)b.KeyBinding.Action == globalAction))
{
string str = action.KeyBinding.KeyCombination.ReadableString();
@ -56,7 +56,7 @@ namespace osu.Game.Input
// compare counts in database vs defaults
foreach (var group in defaults.GroupBy(k => k.Action))
{
int count = Query(rulesetId, variant).Count(k => k.KeyBinding.Action == group.Key);
int count = query(rulesetId, variant).Count(k => (int)k.KeyBinding.Action == (int)group.Key);
int aimCount = group.Count();
if (aimCount <= count)
@ -87,9 +87,15 @@ namespace osu.Game.Input
/// <param name="rulesetId">The ruleset's internal ID.</param>
/// <param name="variant">An optional variant.</param>
/// <returns></returns>
public List<RealmKeyBinding> Query(int? rulesetId = null, int? variant = null) =>
private List<RealmKeyBinding> query(int? rulesetId = null, int? variant = null) =>
ContextFactory.Get().All<RealmKeyBinding>().Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
public List<KeyBinding> Query(int? rulesetId = null, int? variant = null)
=> query(rulesetId, variant).Select(k => k.KeyBinding).ToList();
public List<KeyBinding> Query(GlobalAction action)
=> query(null, null).Where(rkb => rkb.KeyBindingString.StartsWith($"{(int)action}:", StringComparison.Ordinal)).Select(k => k.KeyBinding).ToList();
public void Update(KeyBinding keyBinding)
{
using (ContextFactory.GetForWrite())