From 9571ce03c63359b60c82c42187e0b58005f34c7e Mon Sep 17 00:00:00 2001 From: erri120 Date: Tue, 5 May 2020 16:38:06 +0200 Subject: [PATCH] Fixed Version and NSFW fields to being saved --- Wabbajack.Lib/MO2Compiler.cs | 1 + Wabbajack.Lib/Manifest.cs | 4 ++++ Wabbajack/View Models/Compilers/MO2CompilerVM.cs | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Wabbajack.Lib/MO2Compiler.cs b/Wabbajack.Lib/MO2Compiler.cs index 9e0829a4..a7f05ad6 100644 --- a/Wabbajack.Lib/MO2Compiler.cs +++ b/Wabbajack.Lib/MO2Compiler.cs @@ -326,6 +326,7 @@ namespace Wabbajack.Lib Readme = ModlistReadme ?? "", Image = ModListImage != default ? ModListImage.FileName : default, Website = !string.IsNullOrWhiteSpace(ModListWebsite) ? new Uri(ModListWebsite) : null, + Version = ModlistVersion ?? new Version(1,0,0,0), IsNSFW = ModlistIsNSFW }; diff --git a/Wabbajack.Lib/Manifest.cs b/Wabbajack.Lib/Manifest.cs index bfb527d0..e07a5ff9 100644 --- a/Wabbajack.Lib/Manifest.cs +++ b/Wabbajack.Lib/Manifest.cs @@ -25,6 +25,8 @@ namespace Wabbajack.Lib public long DownloadSize; public long InstallSize; + public bool IsNSFW; + public List Archives; public Manifest(ModList modlist) @@ -43,6 +45,8 @@ namespace Wabbajack.Lib DownloadSize = modlist.DownloadSize; InstallSize = modlist.InstallSize; + IsNSFW = modlist.IsNSFW; + // meta is being omitted due to it being useless and not very space friendly Archives = modlist.Archives.Select(a => new Archive(a.State) { diff --git a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs index 69bb833f..b2d5276d 100644 --- a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs +++ b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs @@ -188,7 +188,8 @@ namespace Wabbajack ModListWebsite = ModlistSettings.Website, ModlistReadme = ModlistSettings.Readme, MO2DownloadsFolder = DownloadLocation.TargetPath, - ModlistVersion = ModlistSettings.Version + ModlistVersion = ModlistSettings.Version, + ModlistIsNSFW = ModlistSettings.IsNSFW }) { Parent.MWVM.Settings.Performance.AttachToBatchProcessor(ActiveCompilation);