Cleanup options and app startup code

haefele · Oct 15, 2023 · f52e517 · f52e517
1 parent abc7ef1
commit f52e517
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/src/ChatPrisma/App.xaml.cs b/src/ChatPrisma/App.xaml.cs
@@ -4,6 +4,7 @@
 using ChatPrisma.Host;
 using ChatPrisma.HostedServices;
 using ChatPrisma.Options;
+using ChatPrisma.Services.AutoStart;
 using ChatPrisma.Services.ChatBot;
 using ChatPrisma.Services.Dialogs;
 using ChatPrisma.Services.KeyboardHooks;
@@ -13,6 +14,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using NLog.Extensions.Hosting;
 using Onova;
 using Onova.Models;
@@ -108,6 +110,15 @@ private IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Ho
                 })
                 .ValidateDataAnnotations()
                 .ValidateOnStart();
+            services.AddOptions<UpdaterOptions>()
+                .Configure(o =>
+                {
+                    o.GitHubUsername = "haefele";
+                    o.GitHubRepository = "ChatPrisma";
+                    o.GitHubReleaseAssetName = "App.zip";
+                })
+                .ValidateDataAnnotations()
+                .ValidateOnStart();
 
             // Services
             services.AddSingleton<IKeyboardHooks, GlobalKeyInterceptorKeyboardHooks>();
@@ -116,10 +127,18 @@ private IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Ho
             services.AddSingleton<IChatBotService, OpenAIChatBotService>();
             services.AddSingleton<IViewModelFactory, ViewModelFactory>();
             services.AddSingleton<IDialogService, DialogService>();
-            services.AddSingleton<IUpdateManager>(new UpdateManager(
-                new AssemblyMetadata("Chat Prisma", Version.Parse(ThisAssembly.AssemblyVersion), Environment.ProcessPath!),
-                new GithubPackageResolver("haefele", "ChatPrisma", "App.zip"),
-                new ZipPackageExtractor()));
+            services.AddSingleton<AssemblyMetadata>(serviceProvider =>
+            {
+                var applicationOptions = serviceProvider.GetRequiredService<IOptions<ApplicationOptions>>().Value;
+                return new AssemblyMetadata(applicationOptions.ApplicationName, Version.Parse(applicationOptions.ApplicationVersion), Environment.ProcessPath!);
+            });
+            services.AddSingleton<IPackageResolver>(serviceProvider =>
+            {
+                var updaterOptions = serviceProvider.GetRequiredService<IOptions<UpdaterOptions>>().Value;
+                return new GithubPackageResolver(updaterOptions.GitHubUsername, updaterOptions.GitHubRepository, updaterOptions.GitHubReleaseAssetName);
+            });
+            services.AddSingleton<IPackageExtractor, ZipPackageExtractor>();
+            services.AddSingleton<IUpdateManager, UpdateManager>();
 
             // Hosted Services
             services.AddHostedService<StartKeyboardHooksHostedService>();

diff --git a/src/ChatPrisma/Options/UpdaterOptions.cs b/src/ChatPrisma/Options/UpdaterOptions.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ChatPrisma.Options;
+
+public class UpdaterOptions
+{
+    [Required]
+    public string GitHubUsername { get; set; } = default!;
+    [Required]
+    public string GitHubRepository { get; set; } = default!;
+    [Required]
+    public string GitHubReleaseAssetName { get; set; } = default!;
+}