Chore: Minor refactoring

Author: BornToBeRoot

Source/NETworkManager.Profiles/ProfileManager.cs

@@ -197,17 +197,21 @@ private static void ProfilesUpdated(bool profilesChanged = true)
 
     /// <summary>
     ///     Method to get the path of the profiles folder.
-    ///     Priority: 1. Policy override, 2. Custom user path (from SettingsInfo), 3. Portable/default.
+    ///     Priority:
+    ///     1. Policy override (for IT administrators)
+    ///     2. Custom user-configured path (not available in portable mode)
+    ///     3. Portable (same directory as the application) or default location (Documents folder)
     /// </summary>
     /// <returns>Path to the profiles folder.</returns>
     public static string GetProfilesFolderLocation()
     {
         // 1. Policy override takes precedence (for IT administrators)
         if (!string.IsNullOrWhiteSpace(PolicyManager.Current?.Profiles_FolderLocation))
         {
-            var validatedPath = ValidateProfilesFolderPath(
+            var validatedPath = DirectoryHelper.ValidateFolderPath(
                 PolicyManager.Current.Profiles_FolderLocation,
                 "Policy-provided",
+                nameof(PolicyInfo.Profiles_FolderLocation),
                 "next priority");
 
             if (validatedPath != null)
@@ -216,11 +220,12 @@ public static string GetProfilesFolderLocation()
 
         // 2. Custom user-configured path (not available in portable mode)
         if (!ConfigurationManager.Current.IsPortable &&
-            !string.IsNullOrWhiteSpace(SettingsManager.Current?.Profiles_CustomProfilesFolderLocation))
+            !string.IsNullOrWhiteSpace(SettingsManager.Current?.Profiles_FolderLocation))
         {
-            var validatedPath = ValidateProfilesFolderPath(
-                SettingsManager.Current.Profiles_CustomProfilesFolderLocation,
+            var validatedPath = DirectoryHelper.ValidateFolderPath(
+                SettingsManager.Current.Profiles_FolderLocation,
                 "Custom",
+                nameof(SettingsInfo.Profiles_FolderLocation),
                 "default location");
 
             if (validatedPath != null)
@@ -253,67 +258,6 @@ public static string GetPortableProfilesFolderLocation()
         return Path.Combine(AssemblyManager.Current.Location, ProfilesFolderName);
     }
 
-    /// <summary>
-    ///     Validates a profiles folder path for correctness and accessibility.
-    /// </summary>
-    /// <param name="path">The path to validate.</param>
-    /// <param name="pathSource">Description of the path source for logging (e.g., "Policy-provided", "Custom").</param>
-    /// <param name="fallbackMessage">Message describing what happens on validation failure (e.g., "next priority", "default location").</param>
-    /// <returns>The validated full path if valid; otherwise, null.</returns>
-    private static string ValidateProfilesFolderPath(string path, string pathSource, string fallbackMessage)
-    {
-        // Expand environment variables first (e.g. %userprofile%\profiles -> C:\Users\...\profiles)
-        path = Environment.ExpandEnvironmentVariables(path);
-
-        // Validate that the path is rooted (absolute)
-        if (!Path.IsPathRooted(path))
-        {
-            Log.Error($"{pathSource} Profiles_FolderLocation is not an absolute path: {path}. Falling back to {fallbackMessage}.");
-            return null;
-        }
-
-        // Validate that the path doesn't contain invalid characters
-        try
-        {
-            // This will throw ArgumentException, NotSupportedException, SecurityException, PathTooLongException, or IOException if the path is invalid
-            var fullPath = Path.GetFullPath(path);
-
-            // Check if the path is a directory (not a file)
-            if (File.Exists(fullPath))
-            {
-                Log.Error($"{pathSource} Profiles_FolderLocation is a file, not a directory: {path}. Falling back to {fallbackMessage}.");
-                return null;
-            }
-
-            return Path.TrimEndingDirectorySeparator(fullPath);
-        }
-        catch (ArgumentException ex)
-        {
-            Log.Error($"{pathSource} Profiles_FolderLocation contains invalid characters: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (NotSupportedException ex)
-        {
-            Log.Error($"{pathSource} Profiles_FolderLocation format is not supported: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (SecurityException ex)
-        {
-            Log.Error($"Insufficient permissions to access {pathSource} Profiles_FolderLocation: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (PathTooLongException ex)
-        {
-            Log.Error($"{pathSource} Profiles_FolderLocation path is too long: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (IOException ex)
-        {
-            Log.Error($"{pathSource} Profiles_FolderLocation caused an I/O error: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-    }
-
     /// <summary>
     ///     Method to get the path of the profiles backup folder.
     /// </summary>

Source/NETworkManager.Settings/SettingsInfo.cs

@@ -576,7 +576,22 @@ public bool Experimental_EnableExperimentalFeatures
         }
     }
 
-    // Profiles    
+    // Profiles
+    private string _profiles_FolderLocation;
+
+    public string Profiles_FolderLocation
+    {
+        get => _profiles_FolderLocation;
+        set
+        {
+            if (value == _profiles_FolderLocation)
+                return;
+
+            _profiles_FolderLocation = value;
+            OnPropertyChanged();
+        }
+    }
+
     private string _profiles_LastSelected;
 
     public string Profiles_LastSelected
@@ -622,25 +637,6 @@ public int Profiles_MaximumNumberOfBackups
         }
     }
 
-    private string _profiles_CustomProfilesFolderLocation;
-
-    /// <summary>
-    /// Custom profiles folder location set by the user.
-    /// When set, overrides the default profiles folder location.
-    /// </summary>
-    public string Profiles_CustomProfilesFolderLocation
-    {
-        get => _profiles_CustomProfilesFolderLocation;
-        set
-        {
-            if (value == _profiles_CustomProfilesFolderLocation)
-                return;
-
-            _profiles_CustomProfilesFolderLocation = value;
-            OnPropertyChanged();
-        }
-    }
-
     // Settings
     private bool _settings_IsDailyBackupEnabled = GlobalStaticConfiguration.Settings_IsDailyBackupEnabled;
 

Source/NETworkManager.Settings/SettingsManager.cs

@@ -5,7 +5,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Security;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Xml.Serialization;
@@ -74,16 +73,21 @@ public static class SettingsManager
 
     /// <summary>
     ///     Method to get the path of the settings folder.
+    ///     Priority:
+    ///     1. Policy override (for IT administrators)
+    ///     2. Custom user-configured path (not available in portable mode)
+    ///     3. Portable (same directory as the application) or default location (Documents folder)
     /// </summary>
     /// <returns>Path to the settings folder.</returns>
     public static string GetSettingsFolderLocation()
     {
         // 1. Policy override takes precedence (for IT administrators)
         if (!string.IsNullOrWhiteSpace(PolicyManager.Current?.Settings_FolderLocation))
         {
-            var validatedPath = ValidateSettingsFolderPath(
+            var validatedPath = DirectoryHelper.ValidateFolderPath(
                 PolicyManager.Current.Settings_FolderLocation,
                 "Policy-provided",
+                nameof(PolicyInfo.Settings_FolderLocation),
                 "next priority");
 
             if (validatedPath != null)
@@ -94,9 +98,10 @@ public static string GetSettingsFolderLocation()
         if (!ConfigurationManager.Current.IsPortable &&
             !string.IsNullOrWhiteSpace(LocalSettingsManager.Current?.Settings_FolderLocation))
         {
-            var validatedPath = ValidateSettingsFolderPath(
+            var validatedPath = DirectoryHelper.ValidateFolderPath(
                 LocalSettingsManager.Current.Settings_FolderLocation,
                 "Custom",
+                nameof(LocalSettingsInfo.Settings_FolderLocation),
                 "default location");
 
             if (validatedPath != null)
@@ -129,67 +134,6 @@ public static string GetPortableSettingsFolderLocation()
         return Path.Combine(AssemblyManager.Current.Location, SettingsFolderName);
     }
 
-    /// <summary>
-    ///     Validates a settings folder path for correctness and accessibility.
-    /// </summary>
-    /// <param name="path">The path to validate.</param>
-    /// <param name="pathSource">Description of the path source for logging (e.g., "Policy-provided", "Custom").</param>
-    /// <param name="fallbackMessage">Message describing what happens on validation failure (e.g., "next priority", "default location").</param>
-    /// <returns>The validated full path if valid; otherwise, null.</returns>
-    private static string ValidateSettingsFolderPath(string path, string pathSource, string fallbackMessage)
-    {
-        // Expand environment variables first (e.g. %userprofile%\settings -> C:\Users\...\settings)
-        path = Environment.ExpandEnvironmentVariables(path);
-
-        // Validate that the path is rooted (absolute)
-        if (!Path.IsPathRooted(path))
-        {
-            Log.Error($"{pathSource} Settings_FolderLocation is not an absolute path: {path}. Falling back to {fallbackMessage}.");
-            return null;
-        }
-
-        // Validate that the path doesn't contain invalid characters
-        try
-        {
-            // This will throw ArgumentException, NotSupportedException, SecurityException, PathTooLongException, or IOException if the path is invalid
-            var fullPath = Path.GetFullPath(path);
-
-            // Check if the path is a directory (not a file)
-            if (File.Exists(fullPath))
-            {
-                Log.Error($"{pathSource} Settings_FolderLocation is a file, not a directory: {path}. Falling back to {fallbackMessage}.");
-                return null;
-            }
-
-            return Path.TrimEndingDirectorySeparator(fullPath);
-        }
-        catch (ArgumentException ex)
-        {
-            Log.Error($"{pathSource} Settings_FolderLocation contains invalid characters: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (NotSupportedException ex)
-        {
-            Log.Error($"{pathSource} Settings_FolderLocation format is not supported: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (SecurityException ex)
-        {
-            Log.Error($"Insufficient permissions to access {pathSource} Settings_FolderLocation: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (PathTooLongException ex)
-        {
-            Log.Error($"{pathSource} Settings_FolderLocation path is too long: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-        catch (IOException ex)
-        {
-            Log.Error($"{pathSource} Settings_FolderLocation caused an I/O error: {path}. Falling back to {fallbackMessage}.", ex);
-            return null;
-        }
-    }
-
     /// <summary>
     ///     Method to get the path of the settings backup folder.
     /// </summary>

Source/NETworkManager.Utilities/DirectoryHelper.cs

@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+using System.Security;
+using log4net;
 
 namespace NETworkManager.Utilities;
 
@@ -8,6 +10,11 @@ namespace NETworkManager.Utilities;
 /// </summary>
 public static class DirectoryHelper
 {
+    /// <summary>
+    ///     Logger for logging.
+    /// </summary>
+    private static readonly ILog Log = LogManager.GetLogger(typeof(DirectoryHelper));
+
     /// <summary>
     ///     Create a directory with subdirectories and resolve environment variables.
     /// </summary>
@@ -16,4 +23,67 @@ public static void CreateWithEnvironmentVariables(string path)
     {
         Directory.CreateDirectory(Environment.ExpandEnvironmentVariables(path));
     }
+
+    /// <summary>
+    ///     Validates a folder path for correctness and accessibility.
+    ///     Expands environment variables, checks that the path is absolute,
+    ///     validates characters, and ensures it does not point to a file.
+    /// </summary>
+    /// <param name="path">The path to validate.</param>
+    /// <param name="pathSource">Description of the path source for logging (e.g., "Policy-provided", "Custom").</param>
+    /// <param name="propertyName">Name of the property being validated for logging (e.g., "Settings_FolderLocation").</param>
+    /// <param name="fallbackMessage">Message describing what happens on validation failure (e.g., "next priority", "default location").</param>
+    /// <returns>The validated full path if valid; otherwise, null.</returns>
+    public static string ValidateFolderPath(string path, string pathSource, string propertyName, string fallbackMessage)
+    {
+        // Expand environment variables first (e.g. %userprofile%\settings -> C:\Users\...\settings)
+        path = Environment.ExpandEnvironmentVariables(path);
+
+        // Validate that the path is rooted (absolute)
+        if (!Path.IsPathRooted(path))
+        {
+            Log.Error($"{pathSource} {propertyName} is not an absolute path: {path}. Falling back to {fallbackMessage}.");
+            return null;
+        }
+
+        // Validate that the path doesn't contain invalid characters
+        try
+        {
+            var fullPath = Path.GetFullPath(path);
+
+            // Check if the path is a directory (not a file)
+            if (File.Exists(fullPath))
+            {
+                Log.Error($"{pathSource} {propertyName} is a file, not a directory: {path}. Falling back to {fallbackMessage}.");
+                return null;
+            }
+
+            return Path.TrimEndingDirectorySeparator(fullPath);
+        }
+        catch (ArgumentException ex)
+        {
+            Log.Error($"{pathSource} {propertyName} contains invalid characters: {path}. Falling back to {fallbackMessage}.", ex);
+            return null;
+        }
+        catch (NotSupportedException ex)
+        {
+            Log.Error($"{pathSource} {propertyName} format is not supported: {path}. Falling back to {fallbackMessage}.", ex);
+            return null;
+        }
+        catch (SecurityException ex)
+        {
+            Log.Error($"Insufficient permissions to access {pathSource} {propertyName}: {path}. Falling back to {fallbackMessage}.", ex);
+            return null;
+        }
+        catch (PathTooLongException ex)
+        {
+            Log.Error($"{pathSource} {propertyName} path is too long: {path}. Falling back to {fallbackMessage}.", ex);
+            return null;
+        }
+        catch (IOException ex)
+        {
+            Log.Error($"{pathSource} {propertyName} caused an I/O error: {path}. Falling back to {fallbackMessage}.", ex);
+            return null;
+        }
+    }
 }

Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs

@@ -243,7 +243,7 @@ private async Task ChangeLocationAction()
         SettingsManager.Save();
 
         // Set new location in SettingsInfo
-        SettingsManager.Current.Profiles_CustomProfilesFolderLocation = Location;
+        SettingsManager.Current.Profiles_FolderLocation = Location;
         SettingsManager.Save();
 
         // Restart the application
@@ -275,7 +275,7 @@ private async Task RestoreDefaultLocationActionAsync()
         SettingsManager.Save();
 
         // Clear custom location to revert to default
-        SettingsManager.Current.Profiles_CustomProfilesFolderLocation = null;
+        SettingsManager.Current.Profiles_FolderLocation = null;
         SettingsManager.Save();
 
         // Restart the application