Merge pull request #131 from Rekkonnect/feature/update-check

Implement update checking

Author: Rekkonnect

Syndiesis/App.axaml.cs

@@ -1,12 +1,12 @@
-using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using Garyon.Objects;
 using Microsoft.CodeAnalysis;
 using Serilog;
 using Serilog.Events;
+using Syndiesis.Updating;
 using Syndiesis.Utilities;
 using Syndiesis.Views;
-using System;
 using System.Reflection;
 
 namespace Syndiesis;
@@ -38,6 +38,11 @@ public static AppResourceManager CurrentResourceManager
 
     public override void Initialize()
     {
+        // Force initialize app settings on the UI thread to avoid troubles
+        // with extra invocation handling when initializing instances from
+        // de-/serializations or first-time accesses. Deadlocks are very
+        // common to encounter when incorrectly using UI thread dispatches
+        _ = AppSettings.Instance;
         AvaloniaXamlLoader.Load(this);
         ResourceManager = new(this);
         AppInfo = CreateAppInfo();
@@ -64,40 +69,46 @@ private static InformationalVersion InformationalVersionForAssembly(Assembly ass
     private static void SetupGeneral()
     {
         SetupSerilog();
-        AppSettings.TryLoad();
+        Task.Run(SetupGeneralAsync);
+    }
+
+    private static async Task SetupGeneralAsync()
+    {
+        await AppSettings.TryLoad();
+        await CheckUpdates();
     }
 
     public override void OnFrameworkInitializationCompleted()
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            SetupDesktop(desktop);
+            SetupDesktopLifetime(desktop);
         }
 
         if (ApplicationLifetime is ISingleViewApplicationLifetime single)
         {
-            SetupSingleView(single);
+            SetupSingleViewLifetime(single);
         }
 
         if (ApplicationLifetime is IControlledApplicationLifetime controlled)
         {
-            SetupControlled(controlled);
+            SetupControlledLifetime(controlled);
         }
 
         base.OnFrameworkInitializationCompleted();
     }
 
-    private void SetupDesktop(IClassicDesktopStyleApplicationLifetime desktop)
+    private void SetupDesktopLifetime(IClassicDesktopStyleApplicationLifetime desktop)
     {
         desktop.MainWindow = new MainWindow();
     }
 
-    private void SetupSingleView(ISingleViewApplicationLifetime single)
+    private void SetupSingleViewLifetime(ISingleViewApplicationLifetime single)
     {
         single.MainView = new MainView();
     }
 
-    private void SetupControlled(IControlledApplicationLifetime controlled)
+    private void SetupControlledLifetime(IControlledApplicationLifetime controlled)
     {
         SetupSerilog(controlled);
         controlled.Exit += HandleControlledLifetimeExit;
@@ -106,7 +117,7 @@ private void SetupControlled(IControlledApplicationLifetime controlled)
     private void HandleControlledLifetimeExit(
         object? sender, ControlledApplicationLifetimeExitEventArgs e)
     {
-        AppSettings.TrySave();
+        Task.Run(() => AppSettings.TrySave());
     }
 
     private void SetupSerilog(IControlledApplicationLifetime lifetime)
@@ -134,4 +145,12 @@ private static void LogApplicationExit(object? sender, EventArgs e)
     {
         LoggerExtensionsEx.LogMethodInvocation(nameof(LogApplicationExit));
     }
+
+    private static async Task CheckUpdates()
+    {
+        if (AppSettings.Instance.UpdateOptions.AutoCheckUpdates)
+        {
+            await Singleton<UpdateManager>.Instance.CheckForUpdates();
+        }
+    }
 }

Syndiesis/AppResourceManager.cs

@@ -1,7 +1,4 @@
-using Avalonia.Controls;
-using Avalonia.Media;
-
-namespace Syndiesis;
+namespace Syndiesis;
 
 public class AppResourceManager(App app)
 {

Syndiesis/AppSettings.cs

@@ -1,7 +1,6 @@
 using Serilog;
 using Syndiesis.Controls.AnalysisVisualization;
 using Syndiesis.Core.DisplayAnalysis;
-using System;
 using System.IO;
 using System.Text.Json;
 
@@ -16,6 +15,7 @@ public sealed class AppSettings
     #region Settings
     public AnalysisNodeCreationOptions NodeLineOptions = new();
     public IndentationOptions IndentationOptions = new();
+    public UpdateOptions UpdateOptions = new();
 
     public StylePreferences NodeColorPreferences = new();
     public ColorizationPreferences ColorizationPreferences = new();
@@ -39,13 +39,16 @@ public sealed class AppSettings
     #endregion
 
     #region Persistence
-    public static bool TryLoad(string path = DefaultPath)
+    public static async Task<bool> TryLoad(string path = DefaultPath)
     {
         try
         {
-            var json = File.ReadAllText(path);
-            var returned = JsonSerializer.Deserialize<AppSettings>(
-                json, AppSettingsSerialization.DefaultOptions);
+            var json = await File.ReadAllTextAsync(path);
+            var returned = await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                return JsonSerializer.Deserialize<AppSettings>(
+                    json, AppSettingsSerialization.DefaultOptions);
+            });
             if (returned is null)
                 return false;
 
@@ -60,13 +63,13 @@ public static bool TryLoad(string path = DefaultPath)
         }
     }
 
-    public static bool TrySave(string path = DefaultPath)
+    public static async Task<bool> TrySave(string path = DefaultPath)
     {
         try
         {
             var json = JsonSerializer.Serialize(
                 Instance, AppSettingsSerialization.DefaultOptions);
-            File.WriteAllText(path, json);
+            await File.WriteAllTextAsync(path, json);
             Log.Information($"Settings saved to '{path}'");
             return true;
         }

Syndiesis/AppSettingsSerialization.cs

@@ -1,6 +1,4 @@
-using Avalonia.Media;
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Syndiesis;

Syndiesis/ColorHelpers/HslTransformation.cs

@@ -1,6 +1,4 @@
-using Avalonia.Media;
-
-namespace Syndiesis.ColorHelpers;
+namespace Syndiesis.ColorHelpers;
 
 public readonly record struct HslTransformation(double Alpha, double Hue, double Saturation, double Lightness)
     : IColorTransformation<HslColor>

Syndiesis/ColorHelpers/HsvTransformation.cs

@@ -1,6 +1,4 @@
-using Avalonia.Media;
-
-namespace Syndiesis.ColorHelpers;
+namespace Syndiesis.ColorHelpers;
 
 public readonly record struct HsvTransformation(
     double Alpha = 0,

Syndiesis/ColorHelpers/IColorTransformation.cs

@@ -1,6 +1,4 @@
-using Avalonia.Media;
-
-namespace Syndiesis.ColorHelpers;
+namespace Syndiesis.ColorHelpers;
 
 public interface IColorTransformation<TColor>
 {

Syndiesis/ColorHelpers/LazilyUpdatedHslTransformedSolidBrush.cs

@@ -1,6 +1,4 @@
-using Avalonia.Media;
-
-namespace Syndiesis.ColorHelpers;
+namespace Syndiesis.ColorHelpers;
 
 public sealed class LazilyUpdatedHslTransformedSolidBrush(
     LazilyUpdatedSolidBrush mainSolid,

Syndiesis/ColorHelpers/LazilyUpdatedHsvTransformedSolidBrush.cs

@@ -1,6 +1,4 @@
-using Avalonia.Media;
-
-namespace Syndiesis.ColorHelpers;
+namespace Syndiesis.ColorHelpers;
 
 public sealed class LazilyUpdatedHsvTransformedSolidBrush(
     ILazilyUpdatedSolidBrush mainSolid,

Syndiesis/ColorHelpers/LazilyUpdatedTransformedSolidBrush.cs

@@ -1,7 +1,4 @@
-using Avalonia.Media;
-using Avalonia.Threading;
-
-namespace Syndiesis.ColorHelpers;
+namespace Syndiesis.ColorHelpers;
 
 public abstract class LazilyUpdatedTransformedSolidBrush<TColorTransformation, TColor>(
     ILazilyUpdatedSolidBrush mainSolid,