Make sure config and backups are read/written next to the executable

Those files would have been written to the current working dir when the tool was launched from a shell
Fs00 · Aug 17, 2023 · f5e5187 · f5e5187
1 parent e9e83d1
commit f5e5187
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/AppConfiguration.cs b/src/AppConfiguration.cs
@@ -8,14 +8,13 @@ namespace Win10BloatRemover;
 
 public class AppConfiguration
 {
-    private const string CONFIGURATION_FILE_NAME = "config.json";
-
     public required string[] ServicesToRemove { get; init; }
     public required UwpAppGroup[] UWPAppsToRemove { get; init; }
     public required UwpAppRemovalMode UWPAppsRemovalMode { get; init; }
     public required string[] ScheduledTasksToDisable { get; init; }
     public required string[] WindowsFeaturesToRemove { get; init; }
 
+    private static readonly string configurationFilePath = Path.Join(AppContext.BaseDirectory, "config.json");
     private static readonly JsonSerializerOptions serializerOptions = new() {
         AllowTrailingCommas = true,
         Converters = { new JsonStringEnumConverter() },
@@ -25,7 +24,7 @@ public class AppConfiguration
 
     public static AppConfiguration LoadOrCreateFile()
     { 
-        if (File.Exists(CONFIGURATION_FILE_NAME))
+        if (File.Exists(configurationFilePath))
         {
             var loadedConfiguration = LoadFromFile();
             return loadedConfiguration;
@@ -39,7 +38,7 @@ private static AppConfiguration LoadFromFile()
     {
         try
         {
-            string settingsFileContent = File.ReadAllText(CONFIGURATION_FILE_NAME, Encoding.UTF8);
+            string settingsFileContent = File.ReadAllText(configurationFilePath, Encoding.UTF8);
             var parsedConfiguration = JsonSerializer.Deserialize<AppConfiguration>(settingsFileContent, serializerOptions);
             if (parsedConfiguration == null)
                 throw new Exception("The file does not contain a valid configuration.");
@@ -56,7 +55,7 @@ private void WriteToFile()
         try
         {
             byte[] settingsFileContent = JsonSerializer.SerializeToUtf8Bytes(this, serializerOptions);
-            File.WriteAllBytes(CONFIGURATION_FILE_NAME, settingsFileContent);
+            File.WriteAllBytes(configurationFilePath, settingsFileContent);
         }
         catch (Exception exc)
         {

diff --git a/src/Operations/ServiceRemover.cs b/src/Operations/ServiceRemover.cs
@@ -51,7 +51,8 @@ public ServiceRemover(IUserInterface ui) : this(ui, DateTime.Now) {}
     public ServiceRemover(IUserInterface ui, DateTime now)
     {
         this.ui = ui;
-        backupDirectory = new DirectoryInfo($"servicesBackup_{now:yyyy-MM-dd_HH-mm-ss}");
+        string backupDirectoryPath = Path.Join(AppContext.BaseDirectory, $"servicesBackup_{now:yyyy-MM-dd_HH-mm-ss}");
+        backupDirectory = new DirectoryInfo(backupDirectoryPath);
     }
 
     public void BackupAndRemove(params string[] servicesToRemove)