diff --git a/Wabbajack.Common/ExtensionManager.cs b/Wabbajack.Common/ExtensionManager.cs index f8e2dd6b..5fc9a740 100644 --- a/Wabbajack.Common/ExtensionManager.cs +++ b/Wabbajack.Common/ExtensionManager.cs @@ -10,10 +10,10 @@ namespace Wabbajack.Common [DllImport("Shell32.dll", CharSet = CharSet.Auto, SetLastError = true)] public static extern void SHChangeNotify(uint wEventId, uint uFlags, IntPtr dwItem1, IntPtr dwItem2); - public static string Extension = ".wabbajack"; + public static string ModListExtension = ".wabbajack"; private static readonly string ProgIDPath = "Software\\Classes\\Wabbajack"; - private static readonly string ExtPath = $"Software\\Classes\\{Extension}"; + private static readonly string ExtPath = $"Software\\Classes\\{ModListExtension}"; private static readonly Dictionary ProgIDList = new Dictionary { diff --git a/Wabbajack.Lib/MO2Installer.cs b/Wabbajack.Lib/MO2Installer.cs index 0c9adb67..73a59b93 100644 --- a/Wabbajack.Lib/MO2Installer.cs +++ b/Wabbajack.Lib/MO2Installer.cs @@ -361,7 +361,7 @@ namespace Wabbajack.Lib foreach (var file in Directory.EnumerateFiles(path)) { if (!File.Exists(file)) continue; - if (System.IO.Path.GetExtension(file).Equals(ExtensionManager.Extension)) + if (System.IO.Path.GetExtension(file).Equals(ExtensionManager.ModListExtension)) { return ErrorResponse.Fail($"Cannot install into a folder with a Wabbajack ModList inside of it"); } diff --git a/Wabbajack.Lib/VortexCompiler.cs b/Wabbajack.Lib/VortexCompiler.cs index 2b605d2a..1c475a35 100644 --- a/Wabbajack.Lib/VortexCompiler.cs +++ b/Wabbajack.Lib/VortexCompiler.cs @@ -61,7 +61,7 @@ namespace Wabbajack.Lib if (string.IsNullOrEmpty(ModListName)) { ModListName = $"Vortex ModList for {Game.ToString()}"; - ModListOutputFile = $"{ModListName}{ExtensionManager.Extension}"; + ModListOutputFile = $"{ModListName}{ExtensionManager.ModListExtension}"; } GameName = Game.MetaData().NexusName; diff --git a/Wabbajack.Test/ACompilerTest.cs b/Wabbajack.Test/ACompilerTest.cs index 19b8fd07..bd26e47e 100644 --- a/Wabbajack.Test/ACompilerTest.cs +++ b/Wabbajack.Test/ACompilerTest.cs @@ -38,7 +38,7 @@ namespace Wabbajack.Test var compiler = new MO2Compiler( mo2Folder: utils.MO2Folder, mo2Profile: profile, - outputFile: profile + ExtensionManager.Extension); + outputFile: profile + ExtensionManager.ModListExtension); compiler.ShowReportWhenFinished = false; Assert.IsTrue(await compiler.Begin()); return compiler; diff --git a/Wabbajack.Test/AVortexCompilerTest.cs b/Wabbajack.Test/AVortexCompilerTest.cs index a8691415..f4efa0a7 100644 --- a/Wabbajack.Test/AVortexCompilerTest.cs +++ b/Wabbajack.Test/AVortexCompilerTest.cs @@ -51,7 +51,7 @@ namespace Wabbajack.Test vortexFolder: VortexCompiler.TypicalVortexFolder(), downloadsFolder: VortexCompiler.RetrieveDownloadLocation(utils.Game), stagingFolder: VortexCompiler.RetrieveStagingLocation(utils.Game), - outputFile: $"test{ExtensionManager.Extension}"); + outputFile: $"test{ExtensionManager.ModListExtension}"); } protected async Task CompileAndInstall() diff --git a/Wabbajack.Test/EndToEndTests.cs b/Wabbajack.Test/EndToEndTests.cs index 1a9da3ef..14434ab5 100644 --- a/Wabbajack.Test/EndToEndTests.cs +++ b/Wabbajack.Test/EndToEndTests.cs @@ -76,7 +76,7 @@ namespace Wabbajack.Test var compiler = new MO2Compiler( mo2Folder: utils.InstallFolder, mo2Profile: profile, - outputFile: profile + ExtensionManager.Extension); + outputFile: profile + ExtensionManager.ModListExtension); compiler.MO2DownloadsFolder = Path.Combine(utils.DownloadsFolder); compiler.ShowReportWhenFinished = false; Assert.IsTrue(await compiler.Begin()); @@ -165,7 +165,7 @@ namespace Wabbajack.Test var compiler = new MO2Compiler( mo2Folder: utils.MO2Folder, mo2Profile: profile, - outputFile: profile + ExtensionManager.Extension); + outputFile: profile + ExtensionManager.ModListExtension); compiler.ShowReportWhenFinished = false; Assert.IsTrue(await compiler.Begin()); return compiler; diff --git a/Wabbajack.Test/MO2Tests.cs b/Wabbajack.Test/MO2Tests.cs index c7021ce9..0e88ebf7 100644 --- a/Wabbajack.Test/MO2Tests.cs +++ b/Wabbajack.Test/MO2Tests.cs @@ -47,7 +47,7 @@ namespace Wabbajack.Test using (var tempDir = new TempFolder()) { File.Create(Path.Combine(tempDir.Dir.FullName, $"ModOrganizer.exe")); - File.Create(Path.Combine(tempDir.Dir.FullName, $"modlist{ExtensionManager.Extension}")); + File.Create(Path.Combine(tempDir.Dir.FullName, $"modlist{ExtensionManager.ModListExtension}")); Assert.IsFalse(MO2Installer.CheckValidInstallPath(tempDir.Dir.FullName, downloadFolder: null).Succeeded); } } diff --git a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs index 945606a3..9496e3a3 100644 --- a/Wabbajack/View Models/Compilers/MO2CompilerVM.cs +++ b/Wabbajack/View Models/Compilers/MO2CompilerVM.cs @@ -168,11 +168,11 @@ namespace Wabbajack string outputFile; if (string.IsNullOrWhiteSpace(Parent.OutputLocation.TargetPath)) { - outputFile = MOProfile + ExtensionManager.Extension; + outputFile = MOProfile + ExtensionManager.ModListExtension; } else { - outputFile = Path.Combine(Parent.OutputLocation.TargetPath, MOProfile + ExtensionManager.Extension); + outputFile = Path.Combine(Parent.OutputLocation.TargetPath, MOProfile + ExtensionManager.ModListExtension); } try diff --git a/Wabbajack/View Models/Compilers/VortexCompilerVM.cs b/Wabbajack/View Models/Compilers/VortexCompilerVM.cs index 26bdce76..8a8ee77a 100644 --- a/Wabbajack/View Models/Compilers/VortexCompilerVM.cs +++ b/Wabbajack/View Models/Compilers/VortexCompilerVM.cs @@ -179,7 +179,7 @@ namespace Wabbajack public async Task Compile() { - string outputFile = $"{ModlistSettings.ModListName}{ExtensionManager.Extension}"; + string outputFile = $"{ModlistSettings.ModListName}{ExtensionManager.ModListExtension}"; if (!string.IsNullOrWhiteSpace(Parent.OutputLocation.TargetPath)) { outputFile = Path.Combine(Parent.OutputLocation.TargetPath, outputFile); diff --git a/Wabbajack/View Models/ModListMetadataVM.cs b/Wabbajack/View Models/ModListMetadataVM.cs index 418a4b8e..602668d5 100644 --- a/Wabbajack/View Models/ModListMetadataVM.cs +++ b/Wabbajack/View Models/ModListMetadataVM.cs @@ -52,7 +52,7 @@ namespace Wabbajack { _parent = parent; Metadata = metadata; - Location = Path.Combine(Consts.ModListDownloadFolder, Metadata.Links.MachineURL + ExtensionManager.Extension); + Location = Path.Combine(Consts.ModListDownloadFolder, Metadata.Links.MachineURL + ExtensionManager.ModListExtension); IsBroken = metadata.ValidationSummary.HasFailures; OpenWebsiteCommand = ReactiveCommand.Create(() => Process.Start($"https://www.wabbajack.org/modlist/{Metadata.Links.MachineURL}")); ExecuteCommand = ReactiveCommand.CreateFromObservable( diff --git a/Wabbajack/View Models/ModeSelectionVM.cs b/Wabbajack/View Models/ModeSelectionVM.cs index 4bd54d46..8377d1eb 100644 --- a/Wabbajack/View Models/ModeSelectionVM.cs +++ b/Wabbajack/View Models/ModeSelectionVM.cs @@ -27,7 +27,7 @@ namespace Wabbajack if (string.IsNullOrWhiteSpace(path) || !File.Exists(path)) { - path = UIUtils.OpenFileDialog($"*{ExtensionManager.Extension}|*{ExtensionManager.Extension}"); + path = UIUtils.OpenFileDialog($"*{ExtensionManager.ModListExtension}|*{ExtensionManager.ModListExtension}"); } _mainVM.OpenInstaller(path); });