Refactor HotkeyModel

Author: VictoriousRaptor

Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs

@@ -11,10 +11,21 @@ public class HotkeyModel
         public bool Shift { get; set; }
         public bool Win { get; set; }
         public bool Ctrl { get; set; }
-        public Key CharKey { get; set; }
 
+        private Key charKey = Key.None;
+        public Key CharKey
+        {
+            get => charKey;
+            set
+            {
+                if (ValidateHotkey(value))
+                {
+                    charKey = value;
+                }
+            }
+        }
 
-        Dictionary<Key, string> specialSymbolDictionary = new Dictionary<Key, string>
+        private static readonly Dictionary<Key, string> specialSymbolDictionary = new Dictionary<Key, string>
         {
             {Key.Space, "Space"},
             {Key.Oem3, "~"}
@@ -86,7 +97,7 @@ private void Parse(string hotkeyString)
                 Ctrl = true;
                 keys.Remove("Ctrl");
             }
-            if (keys.Count > 0)
+            if (keys.Count == 1)
             {
                 string charKey = keys[0];
                 KeyValuePair<Key, string>? specialSymbolPair = specialSymbolDictionary.FirstOrDefault(pair => pair.Value == charKey);
@@ -110,36 +121,61 @@ private void Parse(string hotkeyString)
 
         public override string ToString()
         {
-            string text = string.Empty;
+            List<string> keys = new List<string>();
             if (Ctrl)
             {
-                text += "Ctrl + ";
+                keys.Add("Ctrl");
             }
             if (Alt)
             {
-                text += "Alt + ";
+                keys.Add("Alt");
             }
             if (Shift)
             {
-                text += "Shift + ";
+                keys.Add("Shift");
             }
             if (Win)
             {
-                text += "Win + ";
+                keys.Add("Win");
             }
 
             if (CharKey != Key.None)
             {
-                text += specialSymbolDictionary.ContainsKey(CharKey)
+                keys.Add(specialSymbolDictionary.ContainsKey(CharKey)
                     ? specialSymbolDictionary[CharKey]
-                    : CharKey.ToString();
+                    : CharKey.ToString());
+            }
+            return string.Join(" + ", keys);
+        }
+
+        private static bool ValidateHotkey(Key key)
+        {
+            HashSet<Key> invalidKeys = new()
+            {
+                Key.LeftAlt, Key.RightAlt,
+                Key.LeftCtrl, Key.RightCtrl,
+                Key.LeftShift, Key.RightShift,
+                Key.LWin, Key.RWin,
+            };
+
+            return !invalidKeys.Contains(key);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is HotkeyModel other)
+            {
+                return ModifierKeys == other.ModifierKeys && CharKey == other.charKey;
             }
-            else if (!string.IsNullOrEmpty(text))
+            else
             {
-                text = text.Remove(text.Length - 3);
+                return false;
             }
+        }
 
-            return text;
+        public override int GetHashCode()
+        {
+            return this.ToString().GetHashCode();
         }
     }
 }