V2025.11.4

Author: nlogozzo

Nickvision.Desktop.Tests/ServiceCollectionTests.cs

@@ -66,8 +66,8 @@ public void Case003_Add()
     {
         Assert.IsNotNull(_collection);
         var service = new TestService();
-        Assert.IsTrue(_collection.Add<ITestService>(service));
-        Assert.IsFalse(_collection.Add<ITestService>(service));
+        Assert.IsNotNull(_collection.Add<ITestService>(service));
+        Assert.IsNull(_collection.Add<ITestService>(service));
         Assert.IsTrue(_collection.Has<ITestService>());
         Assert.IsFalse(service.Disposed);
     }
@@ -95,7 +95,7 @@ public void Case006_Dispose()
     {
         Assert.IsNotNull(_collection);
         var service = new TestService();
-        Assert.IsTrue(_collection.Add<ITestService>(service));
+        Assert.IsNotNull(_collection.Add<ITestService>(service));
         Assert.IsFalse(service.Disposed);
         _collection.Dispose();
         _collection = null;

Nickvision.Desktop/Application/AppVersion.cs

@@ -24,7 +24,7 @@ public AppVersion(Version version)
 
     public Version BaseVersion { get; init; }
     public string PreviewLabel { get; init; }
-    
+
     public bool IsPreview => !string.IsNullOrEmpty(PreviewLabel);
 
     public static bool TryParse(string version, out AppVersion? appVersion)

Nickvision.Desktop/Application/ServiceCollection.cs

@@ -42,8 +42,8 @@ public void Dispose()
     /// </summary>
     /// <param name="implementation">The object of the service interface</param>
     /// <typeparam name="T">The service interface</typeparam>
-    /// <returns></returns>
-    public bool Add<T>(T implementation) where T : IService => _services.TryAdd(typeof(T), implementation);
+    /// <returns>The object to the service if successfully added, else null</returns>
+    public T? Add<T>(T implementation) where T : IService => _services.TryAdd(typeof(T), implementation) ? implementation : default(T?);
 
     /// <summary>
     ///     Gets a service from the collection.

Nickvision.Desktop/Filesystem/IJsonFileService.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 namespace Nickvision.Desktop.Filesystem;
 
@@ -7,6 +8,11 @@ namespace Nickvision.Desktop.Filesystem;
 /// </summary>
 public interface IJsonFileService : IService
 {
+    /// <summary>
+    ///     The event for when json files are saved.
+    /// </summary>
+    event EventHandler<JsonFileSavedEventArgs>? Saved;
+
     /// <summary>
     ///     Loads a json file and deserializes it into an object.
     /// </summary>

Nickvision.Desktop/Filesystem/JsonFileSavedEventArgs.cs

@@ -0,0 +1,31 @@
+using System;
+
+namespace Nickvision.Desktop.Filesystem;
+
+/// <summary>
+///     A class of event arguments for when a json file is saved.
+/// </summary>
+public class JsonFileSavedEventArgs : EventArgs
+{
+    public JsonFileSavedEventArgs(object data, Type dataType, string name)
+    {
+        Data = data;
+        DataType = dataType;
+        Name = name;
+    }
+
+    /// <summary>
+    ///     The object that was saved to a json file.
+    /// </summary>
+    public object Data { get; init; }
+
+    /// <summary>
+    ///     The type of the saved object.
+    /// </summary>
+    public Type DataType { get; init; }
+
+    /// <summary>
+    ///     The name of the json file (without the .json extension).
+    /// </summary>
+    public string Name { get; init; }
+}

Nickvision.Desktop/Filesystem/JsonFileService.cs

@@ -43,13 +43,19 @@ public JsonFileService(string directory)
     ///     Constructs a JsonFileService.
     /// </summary>
     /// <param name="appInfo">The AppInfo object for the app</param>
-    /// <remarks>If the environment variable "{AppInfo.Id}.portable" is set, the current working directory will be used. Else, a {AppInfo.Name} folder will be created and used inside the user's configuration directory.</remarks>
-    public JsonFileService(AppInfo appInfo) 
-        : this(Environment.GetEnvironmentVariable($"{appInfo.Id}.portable") is not null ? Directory.GetCurrentDirectory() : Path.Combine(UserDirectories.Config, appInfo.Name))
+    /// <remarks>
+    ///     If the environment variable "{AppInfo.Id}.portable" is set, the current working directory will be used. Else,
+    ///     a {AppInfo.Name} folder will be created and used inside the user's configuration directory.
+    /// </remarks>
+    public JsonFileService(AppInfo appInfo) : this(Environment.GetEnvironmentVariable($"{appInfo.Id}.portable") is not null ? Directory.GetCurrentDirectory() : Path.Combine(UserDirectories.Config, appInfo.Name))
     {
-        
     }
 
+    /// <summary>
+    ///     The event for when json files are saved.
+    /// </summary>
+    public event EventHandler<JsonFileSavedEventArgs>? Saved;
+
     /// <summary>
     ///     Loads a json file and deserializes it into an object.
     /// </summary>
@@ -95,10 +101,16 @@ public async Task<T> LoadAsync<T>(string? name = null)
     /// <returns>True if the file was saved successfully, else false</returns>
     public bool Save<T>(T obj, string? name = null)
     {
+        if (obj is null)
+        {
+            return false;
+        }
+        name = string.IsNullOrEmpty(name) ? typeof(T).Name.ToLower() : name;
         try
         {
             var text = JsonSerializer.Serialize(obj, JsonOptions);
-            File.WriteAllText(Path.Combine(_directory, $"{(string.IsNullOrEmpty(name) ? typeof(T).Name.ToLower() : name)}.json"), text);
+            File.WriteAllText(Path.Combine(_directory, $"{name}.json"), text);
+            Saved?.Invoke(this, new JsonFileSavedEventArgs(obj, typeof(T), name));
             return true;
         }
         catch
@@ -116,10 +128,16 @@ public bool Save<T>(T obj, string? name = null)
     /// <returns>True if the file was saved successfully, else false</returns>
     public async Task<bool> SaveAsync<T>(T obj, string? name = null)
     {
+        if (obj is null)
+        {
+            return false;
+        }
+        name = string.IsNullOrEmpty(name) ? typeof(T).Name.ToLower() : name;
         try
         {
             var text = JsonSerializer.Serialize(obj, JsonOptions);
-            await File.WriteAllTextAsync(Path.Combine(_directory, $"{(string.IsNullOrEmpty(name) ? typeof(T).Name.ToLower() : name)}.json"), text);
+            await File.WriteAllTextAsync(Path.Combine(_directory, $"{name}.json"), text);
+            Saved?.Invoke(this, new JsonFileSavedEventArgs(obj, typeof(T), name));
             return true;
         }
         catch

Nickvision.Desktop/Nickvision.Desktop.csproj

@@ -8,7 +8,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
         <PackageId>Nickvision.Desktop</PackageId>
-        <Version>2025.11.3</Version>
+        <Version>2025.11.4</Version>
         <Company>Nickvision</Company>
         <Authors>Nickvision</Authors>
         <Description>A cross-platform base for Nickvision desktop applications.</Description>