V2023.11.4

Nickvision.Aura/Aura.cs

@@ -1,7 +1,8 @@
-using Nickvision.Aura.Configuration;
-using System;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Runtime.CompilerServices;
+using System.Text.Json;
 using Tmds.DBus;
 
 [assembly: InternalsVisibleTo(Connection.DynamicAssemblyName)]
@@ -15,29 +16,26 @@ public class Aura
 {
     private static Aura? _instance;
 
+    private readonly Dictionary<string, ConfigurationBase> _configFiles;
+
     /// <summary>
     /// The AppInfo object
     /// </summary>
     public AppInfo AppInfo { get; init; }
 
-    /// <summary>
-    /// Dictionary of configuration files that were set
-    /// </summary>
-    public Dictionary<string, ConfigurationBase> ConfigFiles { get; init; }
-
     /// <summary>
     /// Construct Aura
     /// </summary>
     /// <param name="id">ID for AppInfo</param>
     /// <param name="name">Name for AppInfo</param>
     private Aura(string id, string name)
     {
+        _configFiles = new Dictionary<string, ConfigurationBase>();
         AppInfo = new AppInfo()
         {
             ID = id,
             Name = name
         };
-        ConfigFiles = new Dictionary<string, ConfigurationBase>();
     }
 
     /// <summary>
@@ -88,22 +86,31 @@ public IPCServer Communicate(string[] args)
     }
 
     /// <summary>
-    /// Set config to be loaded from JSON file
+    /// Gets a config object
     /// </summary>
-    /// <typeparam name="T">Object type</typeparam>
-    /// <param name="key">File name</param>
-    public void SetConfig<T>(string key) where T : ConfigurationBase => ConfigFiles[key] = ConfigurationLoader.Load<T>(key)!;
-
-    /// <summary>
-    /// Save config to JSON file
-    /// </summary>
-    /// <param name="key">File name</param>
-    public void SaveConfig(string key)
+    /// <typeparam name="T">The type of ConfigurationBase</typeparam>
+    /// <param name="key">The name of the config object</param>
+    /// <returns>The initalized config object</returns>
+    public T GetConfig<T>(string key) where T : ConfigurationBase
     {
-        if (!ConfigFiles.ContainsKey(key))
+        if(!_configFiles.ContainsKey(key))
         {
-            throw new AuraException($"Configuration file \"{key}\" was not set.");
+            var path = $"{UserDirectories.ApplicationConfig}{Path.DirectorySeparatorChar}{key}.json";
+            try
+            {
+                _configFiles[key] = JsonSerializer.Deserialize<T>(File.ReadAllText(path))!;
+            }
+            catch
+            {
+                if (File.Exists(path))
+                {
+                    File.Move(path, $"{path}.bak", true);
+                }
+                File.WriteAllText(path, "{}");
+                _configFiles[key] = JsonSerializer.Deserialize<T>("{}")!;
+            }
+            _configFiles[key].Key = key;
         }
-        ConfigurationLoader.Save(ConfigFiles[key], key);
+        return (T)_configFiles[key];
     }
 }

Nickvision.Aura/ConfigurationBase.cs

@@ -0,0 +1,36 @@
+using System;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Unicode;
+
+namespace Nickvision.Aura;
+
+/// <summary>
+/// Base class for configuration files
+/// </summary>
+public abstract class ConfigurationBase
+{
+    /// <summary>
+    /// The key of the Configuration object
+    /// </summary>
+    internal string? Key { get; set; }
+
+    /// <summary>
+    /// Occurs when the configuration object is saved
+    /// </summary>
+    public event EventHandler<EventArgs>? Saved;
+
+    /// <summary>
+    /// Saves the configuration file
+    /// </summary>
+    public void Save()
+    {
+        if(string.IsNullOrWhiteSpace(Key))
+        {
+            throw new ArgumentException("ConfigurationBase.Key must not be empty");
+        }
+        File.WriteAllText($"{UserDirectories.ApplicationConfig}{Path.DirectorySeparatorChar}{Key}.json", JsonSerializer.Serialize((object)this, new JsonSerializerOptions { WriteIndented = true, Encoder = JavaScriptEncoder.Create(UnicodeRanges.All) }));
+        Saved?.Invoke(this, EventArgs.Empty);
+    }
+}

Nickvision.Aura/Nickvision.Aura.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageId>Nickvision.Aura</PackageId>
-    <Version>2023.11.3</Version>
+    <Version>2023.11.4</Version>
     <Company>Nickvision</Company>
     <Authors>Nickvision</Authors>
     <Description>A cross-platform base for Nickvision applications</Description>
@@ -14,8 +14,7 @@
     <Copyright>(c) Nickvision 2021-2023</Copyright>
     <PackageProjectUrl>https://nickvision.org</PackageProjectUrl>
     <RepositoryUrl>https://github.com/NickvisionApps/Aura</RepositoryUrl>
-    <PackageReleaseNotes>- Added NotificationSentEventArgs and ShellNotificationSentEventArgs to Nickvision.Aura.Events namespace
-- Updated to .NET 8</PackageReleaseNotes>
+    <PackageReleaseNotes>- Improved the Configuration API</PackageReleaseNotes>
     <PackageIcon>logo-r.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>