From 25e5ac05d55d547b82e0cb94face00eaadd4fea8 Mon Sep 17 00:00:00 2001 From: Ionite Date: Sun, 11 Jun 2023 19:41:16 -0400 Subject: [PATCH 1/2] Fix API to initialvalue to be set on first launch --- StabilityMatrix/Models/Packages/A3WebUI.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StabilityMatrix/Models/Packages/A3WebUI.cs b/StabilityMatrix/Models/Packages/A3WebUI.cs index 2a8857bc..c322aa9a 100644 --- a/StabilityMatrix/Models/Packages/A3WebUI.cs +++ b/StabilityMatrix/Models/Packages/A3WebUI.cs @@ -82,7 +82,7 @@ public class A3WebUI : BaseGitPackage new() { Name = "API", - DefaultValue = true, + InitialValue = true, Options = new() {"--api"} }, new() From dad65fb54be9a47860ef1e5921e49be497d5a3b2 Mon Sep 17 00:00:00 2001 From: Ionite Date: Sun, 11 Jun 2023 19:41:47 -0400 Subject: [PATCH 2/2] Load and save launch args on first launch --- StabilityMatrix/ViewModels/LaunchViewModel.cs | 54 ++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/StabilityMatrix/ViewModels/LaunchViewModel.cs b/StabilityMatrix/ViewModels/LaunchViewModel.cs index 6c37c243..e0ef2876 100644 --- a/StabilityMatrix/ViewModels/LaunchViewModel.cs +++ b/StabilityMatrix/ViewModels/LaunchViewModel.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; using System.Windows.Threading; +using AsyncAwaitBestPractices; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Microsoft.Extensions.Logging; @@ -16,6 +17,7 @@ using StabilityMatrix.Python; using Wpf.Ui.Contracts; using Wpf.Ui.Controls.ContentDialogControl; using EventManager = StabilityMatrix.Helper.EventManager; +using ISnackbarService = StabilityMatrix.Helper.ISnackbarService; namespace StabilityMatrix.ViewModels; @@ -28,6 +30,7 @@ public partial class LaunchViewModel : ObservableObject private readonly ILogger logger; private readonly IPyRunner pyRunner; private readonly IDialogFactory dialogFactory; + private readonly ISnackbarService snackbarService; private BasePackage? runningPackage; private bool clearingPackages = false; @@ -72,7 +75,8 @@ public partial class LaunchViewModel : ObservableObject LaunchOptionsDialogViewModel launchOptionsDialogViewModel, ILogger logger, IPyRunner pyRunner, - IDialogFactory dialogFactory) + IDialogFactory dialogFactory, + ISnackbarService snackbarService) { this.pyRunner = pyRunner; this.dialogFactory = dialogFactory; @@ -81,6 +85,7 @@ public partial class LaunchViewModel : ObservableObject this.logger = logger; this.settingsManager = settingsManager; this.packageFactory = packageFactory; + this.snackbarService = snackbarService; SetProcessRunning(false); EventManager.Instance.InstalledPackagesChanged += OnInstalledPackagesChanged; @@ -109,30 +114,55 @@ public partial class LaunchViewModel : ObservableObject public AsyncRelayCommand LaunchCommand => new(async () => { - // Clear console - ConsoleOutput = ""; + var activeInstall = SelectedPackage; - if (SelectedPackage == null) + if (activeInstall == null) + { + // No selected package: error snackbar + snackbarService.ShowSnackbarAsync( + "You must install and select a package before launching", + "No package selected").SafeFireAndForget(); + return; + } + + var activeInstallName = activeInstall.PackageName; + var basePackage = string.IsNullOrWhiteSpace(activeInstallName) + ? null : packageFactory.FindPackageByName(activeInstallName); + + if (basePackage == null) { - ConsoleOutput = "No package selected"; + logger.LogWarning("During launch, package name '{PackageName}' did not match a definition", activeInstallName); + snackbarService.ShowSnackbarAsync( + "Install package name did not match a definition. Please reinstall and let us know about this issue.", + "Package name invalid").SafeFireAndForget(); return; } + + // If this is the first launch (LaunchArgs is null), + // load and save a launch options dialog in background + // so that dynamic initial values are saved. + if (activeInstall.LaunchArgs == null) + { + var definitions = basePackage.LaunchOptions; + // Open a config page and save it + var dialog = dialogFactory.CreateLaunchOptionsDialog(definitions, activeInstall); + var args = dialog.AsLaunchArgs(); + settingsManager.SaveLaunchArgs(activeInstall.Id, args); + } + // Clear console + ConsoleOutput = ""; + await pyRunner.Initialize(); // Get path from package - var packagePath = SelectedPackage.Path!; - var basePackage = packageFactory.FindPackageByName(SelectedPackage.PackageName!); - if (basePackage == null) - { - throw new InvalidOperationException("Package not found"); - } + var packagePath = activeInstall.Path!; basePackage.ConsoleOutput += OnConsoleOutput; basePackage.Exited += OnExit; basePackage.StartupComplete += RunningPackageOnStartupComplete; // Load user launch args from settings and convert to string - var userArgs = settingsManager.GetLaunchArgs(SelectedPackage.Id); + var userArgs = settingsManager.GetLaunchArgs(activeInstall.Id); var userArgsString = string.Join(" ", userArgs.Select(opt => opt.ToArgString())); // Join with extras, if any userArgsString = string.Join(" ", userArgsString, basePackage.ExtraLaunchArguments);