diff --git a/EftPatchHelper/EftPatchHelper/Helpers/FolderCopy.cs b/EftPatchHelper/EftPatchHelper/Helpers/FolderCopy.cs index ecbfb87..cd3f9af 100644 --- a/EftPatchHelper/EftPatchHelper/Helpers/FolderCopy.cs +++ b/EftPatchHelper/EftPatchHelper/Helpers/FolderCopy.cs @@ -18,7 +18,7 @@ namespace EftPatchHelper.Helpers this.DestinationFolder = DestinationFolder; } - public bool Start(bool IgnoreIfExists = false) + public bool Start(bool IgnoreIfExists = false, bool merge = false) { DirectoryInfo sourceDir = new DirectoryInfo(SourceFolder); DirectoryInfo destDir = new DirectoryInfo(DestinationFolder); @@ -33,7 +33,7 @@ namespace EftPatchHelper.Helpers AnsiConsole.MarkupLine("[yellow]Exists[/]"); return true; } - else + else if(!merge) { if (!AnsiConsole.Confirm($"{destDir.FullName} exists. Do you want to overwright it?", false)) { diff --git a/EftPatchHelper/EftPatchHelper/Model/Options.cs b/EftPatchHelper/EftPatchHelper/Model/Options.cs index c884005..b257e56 100644 --- a/EftPatchHelper/EftPatchHelper/Model/Options.cs +++ b/EftPatchHelper/EftPatchHelper/Model/Options.cs @@ -4,8 +4,9 @@ namespace EftPatchHelper.Model { public class Options { - public bool IgnoreExistingDirectories = true; + public bool IgnoreExistingDirectories = false; public EftClient TargetClient = null; public EftClient SourceClient = null; + public string OutputPatchPath = null; } } diff --git a/EftPatchHelper/EftPatchHelper/Model/Settings.cs b/EftPatchHelper/EftPatchHelper/Model/Settings.cs index 7d97fa5..4adb1cd 100644 --- a/EftPatchHelper/EftPatchHelper/Model/Settings.cs +++ b/EftPatchHelper/EftPatchHelper/Model/Settings.cs @@ -25,7 +25,7 @@ namespace EftPatchHelper.Model public bool AutoZip { get; set; } = true; [JsonPropertyName("autoClose")] - public bool AutoClose { get; set; } = false; + public bool AutoClose { get; set; } = true; [JsonPropertyName("patcherExePath")] public string PatcherEXEPath { get; set; } = ""; diff --git a/EftPatchHelper/EftPatchHelper/settings.json b/EftPatchHelper/EftPatchHelper/settings.json index 2fe6fa8..ddde32b 100644 --- a/EftPatchHelper/EftPatchHelper/settings.json +++ b/EftPatchHelper/EftPatchHelper/settings.json @@ -1,9 +1,9 @@ { - "targetEftVersion": "C:\\users\\johno\\desktop\\tmp", - "prepFolderPath": "C:\\users\\johno\\desktop\\tmp", - "backupFolderPath": "C:\\users\\johno\\desktop\\tmp", - "liveEftPath": "C:\\users\\johno\\desktop\\tmp", - "patcherExePath": "C:\\users\\johno\\desktop\\tmp", + "targetEftVersion": "", + "prepFolderPath": "", + "backupFolderPath": "", + "liveEftPath": "", + "patcherExePath": "", "autoZip": true, "autoClose": false } \ No newline at end of file