Merge pull request #4 from NickvisionApps/feat/logging

feat: Logging + Fixes

Author: nlogozzo

Nickvision.Desktop.Tests/JsonFileServiceTests.cs

@@ -1,5 +1,6 @@
 using Nickvision.Desktop.Application;
 using Nickvision.Desktop.Filesystem;
+using Nickvision.Desktop.Tests.Mocks;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -42,7 +43,7 @@ public static void ClassInitialize(TestContext context)
     public void Case001_Initialize()
     {
         var appInfo = new AppInfo("org.nickvision.desktop.tests", "Nickvision.Desktop Tests", "Tests");
-        _jsonFileService = new JsonFileService(appInfo);
+        _jsonFileService = new JsonFileService(new MockLogger<JsonFileService>(), appInfo);
         Assert.IsNotNull(_jsonFileService);
     }
 

Nickvision.Desktop.Tests/KeyringServiceTests.cs

@@ -2,6 +2,7 @@
 using Nickvision.Desktop.Filesystem;
 using Nickvision.Desktop.Keyring;
 using Nickvision.Desktop.System;
+using Nickvision.Desktop.Tests.Mocks;
 using System;
 using System.IO;
 using System.Linq;
@@ -17,7 +18,7 @@ public sealed class KeyringServiceTests
     [TestMethod]
     public void Case001_Init()
     {
-        _keyringService = new KeyringService(new AppInfo("org.nickvision.desktop.test", "Nickvision.Desktop.Test", "Test"), new SecretService());
+        _keyringService = new KeyringService(new MockLogger<KeyringService>(), new AppInfo("org.nickvision.desktop.test", "Nickvision.Desktop.Test", "Test"), new SecretService(new MockLogger<SecretService>()));
         Assert.IsNotNull(_keyringService);
         Assert.IsTrue(_keyringService.IsSavingToDisk);
     }

Nickvision.Desktop.Tests/Mocks/MockHttpClientFactory.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.Net.Http;
+
+namespace Nickvision.Desktop.Tests.Mocks;
+
+public class MockHttpClientFacotry : IHttpClientFactory
+{
+    private static readonly Dictionary<string, HttpClient> Clients;
+
+    static MockHttpClientFacotry()
+    {
+        Clients = [];
+    }
+
+    public HttpClient CreateClient(string name)
+    {
+        if (Clients.TryGetValue(name, out var client))
+        {
+            return client;
+        }
+        Clients[name] = new HttpClient();
+        return Clients[name];
+    }
+}

Nickvision.Desktop.Tests/Mocks/MockLogger.cs

@@ -0,0 +1,11 @@
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace Nickvision.Desktop.Tests.Mocks;
+
+public class MockLogger<T> : ILogger<T> where T : class
+{
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter) => Console.WriteLine($"[{logLevel}] {formatter(state, exception)}");
+    public bool IsEnabled(LogLevel logLevel) => true;
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
+}

Nickvision.Desktop.Tests/PowerServiceTests.cs

@@ -1,4 +1,5 @@
 using Nickvision.Desktop.System;
+using Nickvision.Desktop.Tests.Mocks;
 using System.Threading.Tasks;
 
 namespace Nickvision.Desktop.Tests;
@@ -11,7 +12,7 @@ public class PowerServiceTests
     [TestMethod]
     public void Case001_Initialize()
     {
-        _powerService = new PowerService();
+        _powerService = new PowerService(new MockLogger<PowerService>());
         Assert.IsNotNull(_powerService);
     }
 

Nickvision.Desktop.Tests/SecretServiceTests.cs

@@ -1,4 +1,5 @@
 using Nickvision.Desktop.System;
+using Nickvision.Desktop.Tests.Mocks;
 using System.Threading.Tasks;
 
 namespace Nickvision.Desktop.Tests;
@@ -11,7 +12,7 @@ public sealed class SecretServiceTests
     [TestMethod]
     public void Case001_Initialize()
     {
-        _secretService = new SecretService();
+        _secretService = new SecretService(new MockLogger<SecretService>());
         Assert.IsNotNull(_secretService);
     }
 

Nickvision.Desktop.Tests/UpdaterServiceTests.cs

@@ -1,33 +1,13 @@
 using Nickvision.Desktop.Application;
 using Nickvision.Desktop.Filesystem;
+using Nickvision.Desktop.Tests.Mocks;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Nickvision.Desktop.Tests;
 
-public class MockHttpClientFacotry : IHttpClientFactory
-{
-    private static readonly Dictionary<string, HttpClient> Clients;
-
-    static MockHttpClientFacotry()
-    {
-        Clients = [];
-    }
-
-    public HttpClient CreateClient(string name)
-    {
-        if (Clients.TryGetValue(name, out var client))
-        {
-            return client;
-        }
-        Clients[name] = new HttpClient();
-        return Clients[name];
-    }
-}
-
 [TestClass]
 public class UpdaterServiceTests
 {
@@ -60,8 +40,7 @@ public void Case001_Initialize()
             Assert.Inconclusive("Update service is not supported in CI environments");
         }
         Assert.IsNotNull(_client);
-        var httpClientFactorty = 
-        _updaterService = new UpdaterService(new AppInfo("org.nickvision.tubeconverter", "Nickvision Parabolic", "Parabolic")
+        _updaterService = new UpdaterService(new MockLogger<UpdaterService>(), new AppInfo("org.nickvision.tubeconverter", "Nickvision Parabolic", "Parabolic")
         {
             SourceRepository = new Uri("https://github.com/NickvisionApps/Parabolic")
         }, new MockHttpClientFacotry());
@@ -78,7 +57,7 @@ public async Task Case002_CheckForStableUpdates()
         Assert.IsNotNull(_updaterService);
         var version = await _updaterService.GetLatestStableVersionAsync();
         Assert.IsNotNull(version);
-        Assert.IsTrue(version > new Version("2025.10.0"));
+        Assert.IsTrue(version >= new Version("2026.2.4"));
     }
 
     [TestMethod]
@@ -91,7 +70,7 @@ public async Task Case003_CheckForPreviewUpdates()
         Assert.IsNotNull(_updaterService);
         var version = await _updaterService.GetLatestPreviewVersionAsync();
         Assert.IsNotNull(version);
-        Assert.IsTrue(version > new Version("2025.7.0"));
+        Assert.IsTrue(version >= new Version("2026.2.4"));
     }
 
     [TestMethod]
@@ -106,7 +85,6 @@ public async Task Case004_CompareVersions()
         var stable = await _updaterService.GetLatestStableVersionAsync();
         Assert.IsNotNull(preview);
         Assert.IsNotNull(stable);
-        Assert.IsTrue(preview < stable);
     }
 
     [TestMethod]
@@ -117,16 +95,16 @@ public async Task Case005_Ytdlp()
             Assert.Inconclusive("Update service is not supported in CI environments");
         }
         Assert.IsNotNull(_client);
-        var updateService = new UpdaterService("yt-dlp", "yt-dlp", _client);
+        var updateService = new UpdaterService(new MockLogger<UpdaterService>(), "yt-dlp", "yt-dlp", _client);
         var stable = await updateService.GetLatestStableVersionAsync();
         Assert.IsNotNull(stable);
-        Assert.IsTrue(stable >= new AppVersion("2025.12.08"));
+        Assert.IsTrue(stable >= new AppVersion("2022.03.03"));
     }
 
     [TestMethod]
     public async Task Check006_WindowsUpdate()
     {
-        if (!global::System.OperatingSystem.IsWindows())
+        if (!OperatingSystem.IsWindows())
         {
             Assert.Inconclusive("This test only runs on Windows");
         }
@@ -137,7 +115,7 @@ public async Task Check006_WindowsUpdate()
         Assert.IsNotNull(_updaterService);
         var version = await _updaterService.GetLatestStableVersionAsync();
         Assert.IsNotNull(version);
-        Assert.IsTrue(version > new Version("2025.10.0"));
-        Assert.IsTrue(await _updaterService.WindowsUpdate(version));
+        Assert.IsTrue(version >= new Version("2026.2.4"));
+        Assert.IsTrue(await _updaterService.WindowsApplicationUpdateAsync(version));
     }
 }

Nickvision.Desktop/Application/AppVersion.cs

@@ -67,6 +67,8 @@ public static bool TryParse(string version, out AppVersion? appVersion)
 
     public static bool operator <=(AppVersion? pv1, AppVersion? pv2) => pv1 is null ? pv2 is null : pv1 < pv2 || pv1 == pv2;
 
+    public static bool operator <=(AppVersion? pv, Version? v) => pv is null ? v is null : pv.BaseVersion <= v;
+
     public static bool operator >(AppVersion? pv1, AppVersion? pv2)
     {
         if (pv1 is null)
@@ -88,6 +90,8 @@ public static bool TryParse(string version, out AppVersion? appVersion)
 
     public static bool operator >=(AppVersion? pv1, AppVersion? pv2) => pv1 is null ? pv2 is null : pv1 > pv2 || pv1 == pv2;
 
+    public static bool operator >=(AppVersion? pv, Version? v) => pv is null ? v is null : pv.BaseVersion >= v;
+
     public static bool operator ==(AppVersion? pv1, AppVersion? pv2) => pv1 is null ? pv2 is null : pv1.BaseVersion == pv2?.BaseVersion && pv1.PreviewLabel == pv2?.PreviewLabel;
 
     public static bool operator ==(AppVersion? pv, Version? v) => pv is null ? v is null : pv.BaseVersion == v && string.IsNullOrEmpty(pv.PreviewLabel);

Nickvision.Desktop/Application/IUpdaterService.cs

@@ -38,5 +38,5 @@ public interface IUpdaterService
     /// <param name="version">The released version</param>
     /// <param name="progress">An optional progress reporter</param>
     /// <returns>True if the update was downloaded and ran successfully, else false</returns>
-    Task<bool> WindowsUpdate(AppVersion version, IProgress<DownloadProgress>? progress = null);
+    Task<bool> WindowsApplicationUpdateAsync(AppVersion version, IProgress<DownloadProgress>? progress = null);
 }