Merge pull request #290 from Xcube-Studio/refactor/quick-launch-service

Refactor/quick launch service
Xcube-Studio · Dec 2, 2024 · f146605 · f146605
2 parents 86dd722 + a724b29
commit f146605
Show file tree

Hide file tree

Showing 21 changed files with 499 additions and 319 deletions.
diff --git a/FluentLauncher.Localization b/FluentLauncher.Localization
diff --git a/Natsurainko.FluentLauncher/App.xaml.cs b/Natsurainko.FluentLauncher/App.xaml.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
+using Natsurainko.FluentLauncher.Services.Launch;
 using Natsurainko.FluentLauncher.Services.UI;
 using Natsurainko.FluentLauncher.Services.UI.Messaging;
 using Natsurainko.FluentLauncher.Utils.Extensions;
@@ -42,6 +43,7 @@ void ConfigureApplication()
 
         App.GetService<MessengerService>().SubscribeEvents();
         App.GetService<AppearanceService>().RegisterApp(this);
+        App.GetService<QuickLaunchService>().CleanRemovedJumpListItem();
 
         // Global exception handler
         UnhandledException += (_, e) =>
@@ -58,6 +60,9 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
         mainInstance.Activated += (object? sender, AppActivationArguments e) =>
         {
             DispatcherQueue.TryEnqueue(() => MainWindow?.Activate());
+
+            if (e.Data is Windows.ApplicationModel.Activation.LaunchActivatedEventArgs redirectedArgs)
+                App.GetService<QuickLaunchService>().LaunchFromActivatedEventArgs(redirectedArgs.Arguments.Split(' '));
         };
 
         if (!mainInstance.IsCurrent)
@@ -70,14 +75,6 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
             return;
         }
 
-        string[] cmdargs = Environment.GetCommandLineArgs();
-
-        if (cmdargs.Length > 1 && cmdargs[1].Equals("/quick-launch"))
-        {
-            //App.GetService<JumpListService>().LaunchFromJumpListAsync(cmdargs[2]);
-            return;
-        }
-
         try
         {
             IWindowService mainWindowService = App.GetService<IActivationService>().ActivateWindow("MainWindow");

diff --git a/Natsurainko.FluentLauncher/FLSerializerContext.cs b/Natsurainko.FluentLauncher/FLSerializerContext.cs
@@ -2,12 +2,7 @@
 using Natsurainko.FluentLauncher.Models.UI;
 using Nrk.FluentCore.Authentication;
 using Nrk.FluentCore.GameManagement.Installer;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 
 namespace Natsurainko.FluentLauncher;
 
@@ -38,15 +33,11 @@ namespace Natsurainko.FluentLauncher;
 [JsonSerializable(typeof(string[]))]
 [JsonSerializable(typeof(Windows.UI.Color))]
 [JsonSerializable(typeof(WinUIEx.WindowState))]
-internal partial class FLSerializerContext : JsonSerializerContext
-{
-}
+internal partial class FLSerializerContext : JsonSerializerContext { }
 
 [JsonSerializable(typeof(InstanceConfig))]
 [JsonSourceGenerationOptions(
     IncludeFields = false,
     WriteIndented = true,
     DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
-internal partial class InstanceConfigSerializerContext : JsonSerializerContext
-{
-}
+internal partial class InstanceConfigSerializerContext : JsonSerializerContext { }
diff --git a/Natsurainko.FluentLauncher/Models/Launch/InstanceConfig.cs b/Natsurainko.FluentLauncher/Models/Launch/InstanceConfig.cs
@@ -96,7 +96,7 @@ public IEnumerable<string> VmParameters
     public DateTime? LastLaunchTime
     {
         get => lastLaunchTime;
-        set => App.DispatcherQueue.TryEnqueue(() => SetProperty(ref lastLaunchTime, value));
+        set => SetProperty(ref lastLaunchTime, value);
     }
 
     protected override void OnPropertyChanged(PropertyChangedEventArgs e)

diff --git a/Natsurainko.FluentLauncher/Natsurainko.FluentLauncher.csproj b/Natsurainko.FluentLauncher/Natsurainko.FluentLauncher.csproj
@@ -76,6 +76,7 @@
     <PackageReference Include="NbtToolkit" Version="0.1.2-beta" />
     <PackageReference Include="PInvoke.User32" Version="0.7.124" />
     <PackageReference Include="ReverseMarkdown" Version="4.6.0" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="System.Management" Version="8.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />

diff --git a/Natsurainko.FluentLauncher/Program.cs b/Natsurainko.FluentLauncher/Program.cs
@@ -13,6 +13,7 @@
 using Natsurainko.FluentLauncher.Services.UI.Messaging;
 using Nrk.FluentCore.Resources;
 using System;
+using System.CommandLine;
 using ViewModels = Natsurainko.FluentLauncher.ViewModels;
 using Views = Natsurainko.FluentLauncher.Views;
 
@@ -106,6 +107,7 @@
 services.AddSingleton<CacheSkinService>();
 services.AddSingleton<CacheInterfaceService>();
 //services.AddSingleton<JumpListService>();
+services.AddSingleton<QuickLaunchService>();
 services.AddSingleton<SearchProviderService>();
 services.AddSingleton<InstanceConfigService>();
 
@@ -122,9 +124,36 @@
 var app = builder.Build();
 AppHost = app.Host;
 
-await app.RunAsync();
+await BuildRootCommand(app).InvokeAsync(args);
+//await app.RunAsync();
 
 public partial class Program
 {
     public static IHost AppHost { get; private set; } = null!;
+
+    public static Option<string> MinecraftFolderOption { get; } = new (name: "--minecraftFolder") { IsRequired = true };
+
+    public static Option<string> InstanceIdOption { get; } = new(name: "--instanceId") { IsRequired = true };
+
+    public static RootCommand BuildRootCommand(WinUIApplication application)
+    {
+        var rootCommand = new RootCommand();
+        rootCommand.SetHandler(async () => await application.RunAsync());
+        rootCommand.Add(BuildSubCommand());
+
+        return rootCommand;
+    }
+
+    public static Command BuildSubCommand()
+    {
+        var quickLaunchCommand = new Command("quickLaunch");
+        quickLaunchCommand.AddOption(MinecraftFolderOption);
+        quickLaunchCommand.AddOption(InstanceIdOption);
+
+        quickLaunchCommand.SetHandler(async (folder, instanceId) => 
+            await AppHost.Services.GetService<QuickLaunchService>()!.LaunchFromArguments(folder, instanceId), 
+            MinecraftFolderOption, InstanceIdOption);
+
+        return quickLaunchCommand;
+    }
 }
diff --git a/Natsurainko.FluentLauncher/Services/Launch/LaunchService.cs b/Natsurainko.FluentLauncher/Services/Launch/LaunchService.cs
@@ -1,7 +1,9 @@
-using Natsurainko.FluentLauncher.Models.Launch;
+using CommunityToolkit.Mvvm.Messaging;
+using Natsurainko.FluentLauncher.Models.Launch;
 using Natsurainko.FluentLauncher.Services.Accounts;
 using Natsurainko.FluentLauncher.Services.Network;
 using Natsurainko.FluentLauncher.Services.Settings;
+using Natsurainko.FluentLauncher.Services.UI.Messaging;
 using Natsurainko.FluentLauncher.Utils;
 using Natsurainko.FluentLauncher.Utils.Extensions;
 using Natsurainko.FluentLauncher.ViewModels.Common;
@@ -64,7 +66,7 @@ public LaunchService(
 
     public void LaunchFromUI(MinecraftInstance instance)
     {
-        var viewModel = new LaunchTaskViewModel(instance);
+        var viewModel = new LaunchTaskViewModel(instance, this);
         viewModel.PropertyChanged += (_, e) =>
         {
             if (e.PropertyName == "TaskState")
@@ -74,6 +76,7 @@ public void LaunchFromUI(MinecraftInstance instance)
         App.DispatcherQueue.TryEnqueue(() => LaunchTasks.Insert(0, viewModel));
 
         viewModel.Start();
+        WeakReferenceMessenger.Default.Send(new GlobalNavigationMessage("Tasks/Launch"));
     }
 
     public async Task<MinecraftProcess> LaunchAsync(
@@ -90,7 +93,7 @@ public async Task<MinecraftProcess> LaunchAsync(
         {
             InstanceConfig config = instance.GetConfig();
             config.LastLaunchTime = DateTime.Now;
-            //App.DispatcherQueue.TryEnqueue(() => config.LastLaunchTime = DateTime.Now);
+            await App.GetService<QuickLaunchService>().AddLatestMinecraftInstance(instance);
 
             var preCheckData = await PreCheckLaunchNeeds(instance, config, cancellationToken, progress);