From a77519c6bde35c3b24e0e1888ec7059e1f149555 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 16:53:36 +0900
Subject: [PATCH] Store KeyBinding action to its own field in realm

Also improve the Query method for action types by using generic field
---
 osu.Game/Database/RealmContextFactory.cs   |  2 +-
 osu.Game/Input/Bindings/RealmKeyBinding.cs | 14 ++++++++------
 osu.Game/Input/IKeyBindingStore.cs         |  2 +-
 osu.Game/Input/KeyBindingStore.cs          |  7 +++++--
 osu.Game/Input/RealmKeyBindingStore.cs     |  9 +++++++--
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Database/RealmContextFactory.cs b/osu.Game/Database/RealmContextFactory.cs
index 8e1a0bb8f7..2f6ccb8911 100644
--- a/osu.Game/Database/RealmContextFactory.cs
+++ b/osu.Game/Database/RealmContextFactory.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Database
             contexts.Value++;
             return Realm.GetInstance(new RealmConfiguration(storage.GetFullPath($"{database_name}.realm", true))
             {
-                SchemaVersion = 2,
+                SchemaVersion = 3,
                 MigrationCallback = onMigration
             });
         }
diff --git a/osu.Game/Input/Bindings/RealmKeyBinding.cs b/osu.Game/Input/Bindings/RealmKeyBinding.cs
index 332e4e2b21..eb04766d04 100644
--- a/osu.Game/Input/Bindings/RealmKeyBinding.cs
+++ b/osu.Game/Input/Bindings/RealmKeyBinding.cs
@@ -16,17 +16,19 @@ namespace osu.Game.Input.Bindings
 
         public int? Variant { get; set; }
 
+        public int Action { get; set; }
+
+        public string KeyCombination { get; set; }
+
         [Ignored]
         public KeyBinding KeyBinding
         {
-            get
+            get => new KeyBinding(KeyCombination, Action);
+            set
             {
-                var split = KeyBindingString.Split(':');
-                return new KeyBinding(split[0], int.Parse(split[1]));
+                KeyCombination = value.KeyCombination.ToString();
+                Action = (int)value.Action;
             }
-            set => KeyBindingString = $"{value.KeyCombination}:{(int)value.Action}";
         }
-
-        public string KeyBindingString { get; set; }
     }
 }
diff --git a/osu.Game/Input/IKeyBindingStore.cs b/osu.Game/Input/IKeyBindingStore.cs
index 3574c7237f..c5e68dc6ca 100644
--- a/osu.Game/Input/IKeyBindingStore.cs
+++ b/osu.Game/Input/IKeyBindingStore.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Input
         /// Retrieve <see cref="KeyBinding"/>s for the specified action.
         /// </summary>
         /// <param name="action">The action to lookup.</param>
-        List<KeyBinding> Query(GlobalAction action);
+        List<KeyBinding> Query<T>(T action) where T : Enum;
 
         public void Update(KeyBinding buttonKeyBinding) => throw new NotImplementedException();
     }
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index bbf26c4d8f..53eb0024f8 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -52,8 +52,11 @@ namespace osu.Game.Input
         public List<KeyBinding> Query(int? rulesetId = null, int? variant = null)
             => query(rulesetId, variant).OfType<KeyBinding>().ToList();
 
-        public List<KeyBinding> Query(GlobalAction action)
-            => query(null, null).Where(dkb => (GlobalAction)dkb.Action == action).OfType<KeyBinding>().ToList();
+        public List<KeyBinding> Query<T>(T action) where T : Enum
+        {
+            int lookup = (int)(object)action;
+            return query(null, null).Where(rkb => (int)rkb.Action == lookup).OfType<KeyBinding>().ToList();
+        }
 
         private void insertDefaults(IEnumerable<KeyBinding> defaults, int? rulesetId = null, int? variant = null)
         {
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index 07a340b25c..37d0ce18ed 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -93,8 +93,13 @@ namespace osu.Game.Input
         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 List<KeyBinding> Query<T>(T action)
+            where T : Enum
+        {
+            int lookup = (int)(object)action;
+
+            return query(null, null).Where(rkb => rkb.Action == lookup).Select(k => k.KeyBinding).ToList();
+        }
 
         public void Update(KeyBinding keyBinding)
         {