Merge pull request #642 from Macro-Deck-App/claude/exciting-dirac-928aw7

refactor: store profiles as individual JSON files instead of SQLite

Author: manuelmayer-dev

src/MacroDeck/ActionButton/ActionButton.cs

@@ -53,20 +53,14 @@ protected virtual void Dispose(bool disposing)
 
         HotkeyManager.RemoveHotkey(this);
         VariableManager.OnVariableChanged -= VariableChanged;
-        if (Actions != null)
+        foreach (var pluginAction in Actions)
         {
-            foreach (var pluginAction in Actions)
-            {
-                pluginAction.OnActionButtonDelete();
-            }
+            pluginAction?.OnActionButtonDelete();
         }
-
-        if (EventListeners != null)
+        
+        foreach (var pluginAction in EventListeners.SelectMany(eventListeners => eventListeners.Actions))
         {
-            foreach (var pluginAction in EventListeners.SelectMany(eventListeners => eventListeners.Actions))
-            {
-                pluginAction.OnActionButtonDelete();
-            }
+            pluginAction.OnActionButtonDelete();
         }
 
         _disposed = true;
@@ -90,18 +84,20 @@ private void VariableChanged(object sender, EventArgs e)
             return;
         }
 
-        var variable = sender as Variable;
-        UpdateBindingState(variable);
+        if (sender is Variable variable)
+        {
+            UpdateBindingState(variable);
+        }
     }
 
     private void UpdateBindingState(Variable variable)
     {
-        if (variable == null || !variable.Name.Equals(StateBindingVariable))
+        if (!variable.Name.Equals(StateBindingVariable))
         {
             return;
         }
 
-        bool.TryParse(variable.Value, out var newState);
+        _ = bool.TryParse(variable.Value, out var newState);
         if (variable.Value.ToLower().Equals("on"))
         {
             newState = true;
@@ -110,90 +106,85 @@ private void UpdateBindingState(Variable variable)
         State = newState;
     }
 
-    public string Guid { get; set; } = System.Guid.NewGuid().ToString();
-
-    public event EventHandler StateChanged;
-    public event EventHandler IconChanged;
-
-    private bool _state;
-    private string _iconOff = string.Empty;
-    private string _iconOn = string.Empty;
-    private Color _backgroundColorOff = Color.FromArgb(65, 65, 65);
-    private Color _backgroundColorOn = Color.FromArgb(65, 65, 65);
+    public string Guid { get; set; } = System.Guid.CreateVersion7().ToString();
 
+    public event EventHandler? StateChanged;
+    public event EventHandler? IconChanged;
 
     public bool State
     {
-        get => _state;
+        get;
         set
         {
-            if (_state == value)
+            if (field == value)
             {
                 return;
             }
 
-            _state = value;
+            field = value;
             MacroDeckServer.UpdateState(this);
             StateChanged?.Invoke(this, EventArgs.Empty);
         }
     }
 
     public string IconOff
     {
-        get => _iconOff;
+        get;
 
         set
         {
-            _iconOff = value;
+            field = value;
             IconChanged?.Invoke(this, EventArgs.Empty);
         }
-    }
+    } = string.Empty;
 
     public string IconOn
     {
-        get => _iconOn;
+        get;
         set
         {
-            _iconOn = value;
+            field = value;
             IconChanged?.Invoke(this, EventArgs.Empty);
         }
-    }
+    } = string.Empty;
 
     public Color BackColorOff
     {
-        get => _backgroundColorOff;
+        get;
         set
         {
-            if (_backgroundColorOff == value)
+            if (field == value)
             {
                 return;
             }
 
-            _backgroundColorOff = value;
+            field = value;
             MacroDeckServer.UpdateState(this);
             StateChanged?.Invoke(this, EventArgs.Empty);
         }
-    }
+    } = Color.FromArgb(65, 65, 65);
 
     public Color BackColorOn
     {
-        get => _backgroundColorOn;
+        get;
         set
         {
-            if (_backgroundColorOn == value)
+            if (field == value)
             {
                 return;
             }
 
-            _backgroundColorOn = value;
+            field = value;
             MacroDeckServer.UpdateState(this);
             StateChanged?.Invoke(this, EventArgs.Empty);
         }
-    }
+    } = Color.FromArgb(65, 65, 65);
 
-    public ButtonLabel LabelOff { get; set; } = new();
-    public ButtonLabel LabelOn { get; set; } = new();
+    public ButtonLabel? LabelOff { get; set; } = new();
+    public ButtonLabel? LabelOn { get; set; } = new();
+    // ReSharper disable once InconsistentNaming
     public int Position_X { get; set; } = -1;
+    // ReSharper disable once InconsistentNaming
     public int Position_Y { get; set; } = -1;
     public string StateBindingVariable { get; set; } = string.Empty;
     public List<PluginAction?> Actions { get; set; } = new();

src/MacroDeck/Backup/BackupManager.cs

@@ -79,12 +79,18 @@ public static void CheckRestoreDirectory()
         }
 
         if (restoreBackupInfo.RestoreProfiles &&
-            File.Exists(Path.Combine(restoreDirectory, Path.GetFileName((string?)ApplicationPaths.ProfilesFilePath))))
+            Directory.Exists(Path.Combine(restoreDirectory, new DirectoryInfo(ApplicationPaths.ProfilesDirectoryPath).Name)))
         {
             try
             {
-                File.Copy(Path.Combine(restoreDirectory, Path.GetFileName((string?)ApplicationPaths.ProfilesFilePath)),
-                    ApplicationPaths.ProfilesFilePath,
+                if (Directory.Exists(ApplicationPaths.ProfilesDirectoryPath))
+                {
+                    Directory.Delete(ApplicationPaths.ProfilesDirectoryPath, true);
+                }
+
+                DirectoryCopy.Copy(
+                    Path.Combine(restoreDirectory, new DirectoryInfo(ApplicationPaths.ProfilesDirectoryPath).Name),
+                    ApplicationPaths.ProfilesDirectoryPath,
                     true);
             }
             catch (Exception ex)
@@ -278,8 +284,6 @@ public static void CreateBackup()
             Directory.CreateDirectory(tempBackupPath);
             File.Copy(ApplicationPaths.MainConfigFilePath,
                 Path.Combine(tempBackupPath, Path.GetFileName((string?)ApplicationPaths.MainConfigFilePath)));
-            File.Copy(ApplicationPaths.ProfilesFilePath,
-                Path.Combine(tempBackupPath, Path.GetFileName((string?)ApplicationPaths.ProfilesFilePath)));
             File.Copy(ApplicationPaths.DevicesFilePath,
                 Path.Combine(tempBackupPath, Path.GetFileName((string?)ApplicationPaths.DevicesFilePath)));
             File.Copy(ApplicationPaths.VariablesFilePath,
@@ -309,6 +313,14 @@ private static void CreateBackup(string backupFileName, string tempBackupPath)
             archive.CreateEntryFromFile(file, Path.GetFileName(file));
         }
 
+        var profilesDirectoryInfo = new DirectoryInfo(ApplicationPaths.ProfilesDirectoryPath);
+        foreach (var profileFile in profilesDirectoryInfo.GetFiles("*.json"))
+        {
+            archive.CreateEntryFromFile(
+                profileFile.FullName,
+                Path.Combine(profilesDirectoryInfo.Name, profileFile.Name));
+        }
+
         foreach (var directory in Directory.GetDirectories(ApplicationPaths.PluginsDirectoryPath))
         {
             var pluginDirectoryInfo = new DirectoryInfo(directory);

src/MacroDeck/Device/MacroDeckDevice.cs

@@ -25,7 +25,7 @@ public bool Available
 
     public bool Blocked { get; set; } = false;
 
-    public string ProfileId { get; set; }
+    public string? ProfileId { get; set; }
 
     public DeviceConfiguration Configuration { get; set; } = new();