PR comments

Author: deansheather

.github/workflows/release.yaml

@@ -148,7 +148,6 @@ jobs:
         $newAppCastSignaturePath = $newAppCastPath + ".signature"
         & ./scripts/Update-AppCast.ps1 `
           -tag "${{ github.ref_name }}" `
-          -version "${{ steps.version.outputs.VERSION }}" `
           -channel stable `
           -x64Path "${{ steps.release.outputs.X64_OUTPUT_PATH }}" `
           -arm64Path "${{ steps.release.outputs.ARM64_OUTPUT_PATH }}" `

App/Controls/TrayIcon.xaml

@@ -32,7 +32,7 @@
                         <XamlUICommand
                             Label="Show Window"
                             Description="Show Window"
-                            Command="{x:Bind OpenCommand, Mode=OneWay}">
+                            Command="{x:Bind OpenCommand}">
 
                             <XamlUICommand.IconSource>
                                 <SymbolIconSource Symbol="OpenPane" />
@@ -53,7 +53,7 @@
                         <XamlUICommand
                             Label="Check for Updates"
                             Description="Check for Updates"
-                            Command="{x:Bind CheckForUpdatesCommand, Mode=OneWay}">
+                            Command="{x:Bind CheckForUpdatesCommand}">
 
                             <XamlUICommand.IconSource>
                                 <SymbolIconSource Symbol="Download" />
@@ -74,7 +74,7 @@
                         <XamlUICommand
                             Label="Exit"
                             Description="Exit"
-                            Command="{x:Bind ExitCommand, Mode=OneWay}">
+                            Command="{x:Bind ExitCommand}">
 
                             <XamlUICommand.IconSource>
                                 <SymbolIconSource Symbol="ClosePane" />

App/Services/SettingsManager.cs

@@ -28,15 +28,43 @@ namespace Coder.Desktop.App.Services;
     Task Write(T settings, CancellationToken ct = default);
 }
 
+public static class SettingsManagerUtils
+{
+    private const string AppName = "CoderDesktop";
+
+    /// <summary>
+    /// Generates the settings directory path and ensures it exists.
+    /// </summary>
+    /// <param name="settingsFilePath">Custom settings root, defaults to AppData/Local</param>
+    public static string AppSettingsDirectory(string? settingsFilePath = null)
+    {
+        if (settingsFilePath is null)
+        {
+            settingsFilePath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+        }
+        else if (!Path.IsPathRooted(settingsFilePath))
+        {
+            throw new ArgumentException("settingsFilePath must be an absolute path if provided", nameof(settingsFilePath));
+        }
+
+        var folder = Path.Combine(
+                settingsFilePath,
+                AppName);
+
+        Directory.CreateDirectory(folder);
+        return folder;
+    }
+}
+
 /// <summary>
-/// Implemention of <see cref="ISettingsManager"/> that persists settings to a JSON file
-/// located in the user's local application data folder.
+/// Implementation of <see cref="ISettingsManager"/> that persists settings to
+/// a JSON file located in the user's local application data folder.
 /// </summary>
 public sealed class SettingsManager<T> : ISettingsManager<T> where T : ISettings<T>, new()
 {
+
     private readonly string _settingsFilePath;
-    private readonly string _appName = "CoderDesktop";
-    private string _fileName;
+    private readonly string _fileName;
 
     private T? _cachedSettings;
 
@@ -49,20 +77,7 @@ namespace Coder.Desktop.App.Services;
     /// </param>
     public SettingsManager(string? settingsFilePath = null)
     {
-        if (settingsFilePath is null)
-        {
-            settingsFilePath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-        }
-        else if (!Path.IsPathRooted(settingsFilePath))
-        {
-            throw new ArgumentException("settingsFilePath must be an absolute path if provided", nameof(settingsFilePath));
-        }
-
-        var folder = Path.Combine(
-                settingsFilePath,
-                _appName);
-
-        Directory.CreateDirectory(folder);
+        var folder = SettingsManagerUtils.AppSettingsDirectory(settingsFilePath);
 
         _fileName = T.SettingsFileName;
         _settingsFilePath = Path.Combine(folder, _fileName);

App/Services/UpdateController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,6 +12,8 @@
 using Microsoft.UI.Xaml;
 using NetSparkleUpdater;
 using NetSparkleUpdater.AppCastHandlers;
+using NetSparkleUpdater.AssemblyAccessors;
+using NetSparkleUpdater.Configurations;
 using NetSparkleUpdater.Enums;
 using NetSparkleUpdater.Interfaces;
 using NetSparkleUpdater.SignatureVerifiers;
@@ -94,10 +97,16 @@ public SparkleUpdateController(ILogger<SparkleUpdateController> logger, IOptions
             publicKey: _config.PublicKeyBase64,
             readFileBeingVerifiedInChunks: true);
 
+        // Tell NetSparkle to store its configuration in the same directory as
+        // our other config files.
+        var appConfigDir = SettingsManagerUtils.AppSettingsDirectory();
+        var sparkleConfigPath = Path.Combine(appConfigDir, "updater.json");
+        var sparkleAssemblyAccessor = new AssemblyDiagnosticsAccessor(null); // null => use current executable path
+        var sparkleConfig = new JSONConfiguration(sparkleAssemblyAccessor, sparkleConfigPath);
+
         _sparkle = new SparkleUpdater(_config.AppCastUrl, checker)
         {
-            // TODO: custom Configuration for persistence, could just specify
-            //       our own save path with JSONConfiguration TBH
+            Configuration = sparkleConfig,
             // GitHub releases endpoint returns a random UUID as the filename,
             // so we tell NetSparkle to ignore it and use the last segment of
             // the URL instead.
@@ -141,14 +150,14 @@ public async Task CheckForUpdatesNow()
         try
         {
             if (coderFactory is not null)
-                coderFactory.ForceDisableToasts = true;
+                coderFactory.ForceDisableToastMessages = true;
 
             await _sparkle.CheckForUpdatesAtUserRequest(true);
         }
         finally
         {
             if (coderFactory is not null)
-                coderFactory.ForceDisableToasts = false;
+                coderFactory.ForceDisableToastMessages = false;
         }
     }
 
@@ -192,7 +201,7 @@ public override List<AppCastItem> FilterUpdates(List<AppCastItem> items)
 // ReSharper disable once InconsistentNaming // the interface name is "UI", not "Ui"
 public class CoderSparkleUIFactory(IUserNotifier userNotifier, IUpdaterUpdateAvailableViewModelFactory updateAvailableViewModelFactory) : IUIFactory
 {
-    public bool ForceDisableToasts;
+    public bool ForceDisableToastMessages;
 
     bool IUIFactory.HideReleaseNotes { get; set; }
     bool IUIFactory.HideSkipButton { get; set; }
@@ -276,7 +285,7 @@ void IUIFactory.ShowDownloadErrorMessage(string message, string? appcastUrl)
 
     bool IUIFactory.CanShowToastMessages()
     {
-        return !ForceDisableToasts;
+        return !ForceDisableToastMessages;
     }
 
     void IUIFactory.ShowToast(Action clickHandler)

App/Views/MessageWindow.xaml

@@ -12,7 +12,7 @@
     MinWidth="500" MinHeight="240">
 
     <Window.SystemBackdrop>
-        <DesktopAcrylicBackdrop />
+        <MicaBackdrop />
     </Window.SystemBackdrop>
 
     <Grid Padding="24">

App/Views/MessageWindow.xaml.cs

@@ -1,9 +1,5 @@
-using System.Diagnostics;
-using Windows.Foundation;
-using Windows.Graphics;
 using Coder.Desktop.App.Utils;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Media;
 using WinUIEx;
 
 namespace Coder.Desktop.App.Views;
@@ -21,7 +17,6 @@ public MessageWindow(string title, string content, string windowTitle = "Coder D
 
         InitializeComponent();
         TitleBarIcon.SetTitlebarIcon(this);
-        SystemBackdrop = new DesktopAcrylicBackdrop();
         this.CenterOnScreen();
         AppWindow.Show();
 

App/Views/UpdaterCheckingForUpdatesWindow.xaml

@@ -13,7 +13,7 @@
     Width="500" Height="190">
 
     <Window.SystemBackdrop>
-        <DesktopAcrylicBackdrop />
+        <MicaBackdrop />
     </Window.SystemBackdrop>
 
     <StackPanel Orientation="Vertical" Padding="32">

App/Views/UpdaterCheckingForUpdatesWindow.xaml.cs

@@ -1,4 +1,3 @@
-using Microsoft.UI.Xaml.Media;
 using System;
 using Coder.Desktop.App.Utils;
 using NetSparkleUpdater.Interfaces;
@@ -15,7 +14,6 @@ public UpdaterCheckingForUpdatesWindow()
     {
         InitializeComponent();
         TitleBarIcon.SetTitlebarIcon(this);
-        SystemBackdrop = new DesktopAcrylicBackdrop();
         AppWindow.Hide();
 
         Closed += (_, _) => UpdatesUIClosing?.Invoke(this, EventArgs.Empty);

App/Views/UpdaterDownloadProgressWindow.xaml

@@ -13,7 +13,7 @@
     MinWidth="500" MinHeight="190">
 
     <Window.SystemBackdrop>
-        <DesktopAcrylicBackdrop />
+        <MicaBackdrop />
     </Window.SystemBackdrop>
 
     <Frame x:Name="RootFrame" />

App/Views/UpdaterDownloadProgressWindow.xaml.cs

@@ -1,4 +1,3 @@
-using Microsoft.UI.Xaml.Media;
 using Coder.Desktop.App.Utils;
 using Coder.Desktop.App.ViewModels;
 using Coder.Desktop.App.Views.Pages;
@@ -16,7 +15,7 @@ public sealed partial class UpdaterDownloadProgressWindow : WindowEx, IDownloadP
 
     public UpdaterDownloadProgressViewModel ViewModel;
 
-    private bool _didCallDownloadProcessCompletedHandler;
+    private bool _downloadProcessCompletedInvoked;
 
     public UpdaterDownloadProgressWindow(UpdaterDownloadProgressViewModel viewModel)
     {
@@ -25,7 +24,6 @@ public UpdaterDownloadProgressWindow(UpdaterDownloadProgressViewModel viewModel)
 
         InitializeComponent();
         TitleBarIcon.SetTitlebarIcon(this);
-        SystemBackdrop = new DesktopAcrylicBackdrop();
         AppWindow.Hide();
 
         RootFrame.Content = new UpdaterDownloadProgressMainPage(ViewModel);
@@ -35,9 +33,9 @@ public UpdaterDownloadProgressWindow(UpdaterDownloadProgressViewModel viewModel)
 
     public void SendResponse(DownloadInstallEventArgs args)
     {
-        if (_didCallDownloadProcessCompletedHandler)
+        if (_downloadProcessCompletedInvoked)
             return;
-        _didCallDownloadProcessCompletedHandler = true;
+        _downloadProcessCompletedInvoked = true;
         DownloadProcessCompleted?.Invoke(this, args);
     }