From e2ebeb9af6f68b0d259be8bb9ad396c05d638a57 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Sat, 18 Jan 2020 15:53:10 -0600 Subject: [PATCH 1/2] ISubCompilerVM.Compile returns bool now Completion status now marked failure if that bool is false --- Wabbajack/View Models/Compilers/CompilerVM.cs | 4 ++-- Wabbajack/View Models/Compilers/ISubCompilerVM.cs | 2 +- Wabbajack/View Models/Compilers/MO2CompilerVM.cs | 4 ++-- Wabbajack/View Models/Compilers/VortexCompilerVM.cs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Wabbajack/View Models/Compilers/CompilerVM.cs b/Wabbajack/View Models/Compilers/CompilerVM.cs index 48d5dfdc..00531ec9 100644 --- a/Wabbajack/View Models/Compilers/CompilerVM.cs +++ b/Wabbajack/View Models/Compilers/CompilerVM.cs @@ -184,8 +184,8 @@ namespace Wabbajack { try { - await this.Compiler.Compile(); - Completed = ErrorResponse.Success; + var successful = await this.Compiler.Compile(); + Completed = ErrorResponse.Create(successful); } catch (Exception ex) { diff --git a/Wabbajack/View Models/Compilers/ISubCompilerVM.cs b/Wabbajack/View Models/Compilers/ISubCompilerVM.cs index eadbf82d..472cf29f 100644 --- a/Wabbajack/View Models/Compilers/ISubCompilerVM.cs +++ b/Wabbajack/View Models/Compilers/ISubCompilerVM.cs @@ -12,6 +12,6 @@ namespace Wabbajack ModlistSettingsEditorVM ModlistSettings { get; } void Unload(); IObservable CanCompile { get; } - Task Compile(); + Task Compile(); } } diff --git a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs index 4f924ef7..945606a3 100644 --- a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs +++ b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs @@ -163,7 +163,7 @@ namespace Wabbajack ModlistSettings?.Save(); } - public async Task Compile() + public async Task Compile() { string outputFile; if (string.IsNullOrWhiteSpace(Parent.OutputLocation.TargetPath)) @@ -193,7 +193,7 @@ namespace Wabbajack { Parent.MWVM.Settings.Performance.AttachToBatchProcessor(ActiveCompilation); - await ActiveCompilation.Begin(); + return await ActiveCompilation.Begin(); } } finally diff --git a/Wabbajack/View Models/Compilers/VortexCompilerVM.cs b/Wabbajack/View Models/Compilers/VortexCompilerVM.cs index 08dcc7b8..26bdce76 100644 --- a/Wabbajack/View Models/Compilers/VortexCompilerVM.cs +++ b/Wabbajack/View Models/Compilers/VortexCompilerVM.cs @@ -177,7 +177,7 @@ namespace Wabbajack GameLocation.TargetPath = StoreHandler.Instance.GetGamePath(SelectedGame.Game, StoreType.GOG); } - public async Task Compile() + public async Task Compile() { string outputFile = $"{ModlistSettings.ModListName}{ExtensionManager.Extension}"; if (!string.IsNullOrWhiteSpace(Parent.OutputLocation.TargetPath)) @@ -204,7 +204,7 @@ namespace Wabbajack }) { Parent.MWVM.Settings.Performance.AttachToBatchProcessor(ActiveCompilation); - await ActiveCompilation.Begin(); + return await ActiveCompilation.Begin(); } } finally From f1c0da3b4f8149e4954a2d7a0c05a557c3acfb01 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Sat, 18 Jan 2020 15:57:53 -0600 Subject: [PATCH 2/2] ISubInstallerVM.Compile returns bool now --- Wabbajack/View Models/Installers/ISubInstallerVM.cs | 2 +- Wabbajack/View Models/Installers/InstallerVM.cs | 4 ++-- Wabbajack/View Models/Installers/MO2InstallerVM.cs | 7 +++---- Wabbajack/View Models/Installers/VortexInstallerVM.cs | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Wabbajack/View Models/Installers/ISubInstallerVM.cs b/Wabbajack/View Models/Installers/ISubInstallerVM.cs index 208a20d0..ca773423 100644 --- a/Wabbajack/View Models/Installers/ISubInstallerVM.cs +++ b/Wabbajack/View Models/Installers/ISubInstallerVM.cs @@ -18,6 +18,6 @@ namespace Wabbajack void AfterInstallNavigation(); int ConfigVisualVerticalOffset { get; } IObservable CanInstall { get; } - Task Install(); + Task Install(); } } diff --git a/Wabbajack/View Models/Installers/InstallerVM.cs b/Wabbajack/View Models/Installers/InstallerVM.cs index f1dbf785..5195cf09 100644 --- a/Wabbajack/View Models/Installers/InstallerVM.cs +++ b/Wabbajack/View Models/Installers/InstallerVM.cs @@ -364,8 +364,8 @@ namespace Wabbajack { try { - await this.Installer.Install(); - Completed = ErrorResponse.Success; + var success = await this.Installer.Install(); + Completed = ErrorResponse.Create(success); try { this.ModList?.OpenReadmeWindow(); diff --git a/Wabbajack/View Models/Installers/MO2InstallerVM.cs b/Wabbajack/View Models/Installers/MO2InstallerVM.cs index 8ced7dd8..9ddb428f 100644 --- a/Wabbajack/View Models/Installers/MO2InstallerVM.cs +++ b/Wabbajack/View Models/Installers/MO2InstallerVM.cs @@ -143,7 +143,7 @@ namespace Wabbajack Process.Start("explorer.exe", Location.TargetPath); } - public async Task Install() + public async Task Install() { using (var installer = new MO2Installer( archive: Parent.ModListLocation.TargetPath, @@ -154,14 +154,13 @@ namespace Wabbajack { Parent.MWVM.Settings.Performance.AttachToBatchProcessor(installer); - await Task.Run(async () => + return await Task.Run(async () => { try { var workTask = installer.Begin(); ActiveInstallation = installer; - await workTask; - return ErrorResponse.Success; + return await workTask; } finally { diff --git a/Wabbajack/View Models/Installers/VortexInstallerVM.cs b/Wabbajack/View Models/Installers/VortexInstallerVM.cs index 352aa7b2..e16282b2 100644 --- a/Wabbajack/View Models/Installers/VortexInstallerVM.cs +++ b/Wabbajack/View Models/Installers/VortexInstallerVM.cs @@ -57,7 +57,7 @@ namespace Wabbajack throw new NotImplementedException(); } - public async Task Install() + public async Task Install() { AInstaller installer; @@ -72,13 +72,13 @@ namespace Wabbajack { Parent.MWVM.Settings.Performance.AttachToBatchProcessor(installer); - await Task.Run(async () => + return await Task.Run(async () => { try { var workTask = installer.Begin(); ActiveInstallation = installer; - await workTask; + return await workTask; } finally {