Feature: Env var for folder

Author: BornToBeRoot

Source/NETworkManager.Localization/Resources/Strings.Designer.cs

@@ -3985,4 +3985,7 @@ You can copy the “settings.json” file from "{0}" to "{1}" to migrate your pr
 
 You can copy the “settings.json” file from "{0}" to "{1}" to migrate your previous settings, if necessary. The application must be closed for this to prevent the settings from being overwritten.</value>
   </data>
+  <data name="EnterValidFolderPath" xml:space="preserve">
+    <value>Enter a valid folder path!</value>
+  </data>
 </root>

Source/NETworkManager.Localization/Resources/Strings.resx

@@ -139,6 +139,9 @@ public static string GetPortableSettingsFolderLocation()
     /// <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))
         {
@@ -159,7 +162,7 @@ private static string ValidateSettingsFolderPath(string path, string pathSource,
                 return null;
             }
 
-            return fullPath;
+            return fullPath.TrimEnd('\\');
         }
         catch (ArgumentException ex)
         {

Source/NETworkManager.Settings/SettingsManager.cs

@@ -85,6 +85,30 @@ public static partial class RegexHelper
     [GeneratedRegex($@"^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|{SpecialRangeRegex})\.){{3}}((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|{SpecialRangeRegex})$")]
     public static partial Regex IPv4AddressSpecialRangeRegex();
 
+    /// <summary>
+    /// Provides a compiled regular expression that matches valid hostnames or fully qualified domain names (FQDNs) like
+    /// server-01 or server-01.example.com.
+    /// </summary>
+    /// <returns> A <see cref="Regex"/> instance that matches valid hostnames or FQDNs.</returns>
+    [GeneratedRegex($@"^{HostnameOrDomainValues}$")]
+    public static partial Regex HostnameOrDomainRegex();
+
+    /// <summary>
+    /// Creates a regular expression that matches a local directory path or one using environment variables,
+    /// like "C:\Temp", "C:\My Settings", "%AppData%\settings".
+    /// </summary>    
+    /// <returns>A <see cref="Regex"/> instance that matches valid local directory paths.</returns>
+    [GeneratedRegex($@"^(?:%[^%]+%|[a-zA-Z]\:)(\\[a-zA-Z0-9_\-\s\.]+)+\\?$")]
+    public static partial Regex DirectoryPathWithEnvironmentVariablesRegex();
+
+    /// <summary>
+    /// Creates a regular expression that matches a UNC path like "\\server\share", "\\server\c$\settings".
+    /// The share name may end with $ for hidden shares.
+    /// </summary>
+    /// <returns>A <see cref="Regex"/> instance that matches valid UNC paths.</returns>
+    [GeneratedRegex($@"^\\\\[a-zA-Z0-9_\-\.]+(\\[a-zA-Z0-9_\-\s\.]+\$?)(\\[a-zA-Z0-9_\-\s\.]+)*\\?$")]
+    public static partial Regex UncPathRegex();
+
     // Match a MAC-Address 000000000000 00:00:00:00:00:00, 00-00-00-00-00-00-00 or 0000.0000.0000
     public const string MACAddressRegex =
         @"^^[A-Fa-f0-9]{12}$|^[A-Fa-f0-9]{2}(:|-){1}[A-Fa-f0-9]{2}(:|-){1}[A-Fa-f0-9]{2}(:|-){1}[A-Fa-f0-9]{2}(:|-){1}[A-Fa-f0-9]{2}(:|-){1}[A-Fa-f0-9]{2}$|^[A-Fa-f0-9]{4}.[A-Fa-f0-9]{4}.[A-Fa-f0-9]{4}$$";
@@ -107,16 +131,6 @@ public static partial class RegexHelper
     public const string SpecialRangeRegex =
         @"\[((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)-(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))([,]((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)-(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))))*\]";
 
-
-
-    /// <summary>
-    /// Provides a compiled regular expression that matches valid hostnames or fully qualified domain names (FQDNs) like
-    /// server-01 or server-01.example.com.
-    /// </summary>
-    /// <returns> A <see cref="Regex"/> instance that matches valid hostnames or FQDNs.</returns>
-    [GeneratedRegex($@"^{HostnameOrDomainValues}$")]
-    public static partial Regex HostnameOrDomainRegex();
-
     // Match a hostname with cidr like server-01.example.com/24
     public const string HostnameOrDomainWithCidrRegex = $@"^{HostnameOrDomainValues}\/{CidrRegexValues}$";
 
@@ -134,9 +148,6 @@ public static partial class RegexHelper
     // Match a port between 1-65535
     public const string PortRegex = $@"^{PortValues}$";
 
-    // Match any filepath (like "c:\temp\") --> https://www.codeproject.com/Tips/216238/Regular-Expression-to-Validate-File-Path-and-Exten
-    public const string FilePathRegex = @"^(?:[\w]\:|\\)(\\[a-z_\-\s0-9\.]+)+$";
-
     // Match any fullname (like "c:\temp\test.txt") --> https://www.codeproject.com/Tips/216238/Regular-Expression-to-Validate-File-Path-and-Exten
     public const string FullNameRegex =
         @"^(?:[\w]\:|\\)(\\[a-zA-Z0-9_\-\s\.()~!@#$%^&=+';,{}\[\]]+)+\.[a-zA-z0-9]{1,4}$";

Source/NETworkManager.Utilities/RegexHelper.cs

@@ -1,31 +1,32 @@
-using System;
-using System.Globalization;
-using System.Text.RegularExpressions;
+using System.Globalization;
 using System.Windows.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Utilities;
 
 namespace NETworkManager.Validators;
 
 /// <summary>
-///     Check if the string is a valid directory path (like "C:\Temp\" or "%AppData%\Temp"). The directory path does not
-///     have to exist on the local system.
+/// Provides a validation rule that determines whether a value represents a syntactically valid directory path,
+/// supporting the inclusion of environment variable references like %UserProfile%.
 /// </summary>
 public class DirectoryPathWithEnvironmentVariablesValidator : ValidationRule
 {
     /// <summary>
-    ///     Check if the string is a valid directory path (like "C:\Temp\" or "%AppData%\Temp"). The directory path does not
-    ///     have to exist on the local system.
-    /// </summary>
-    /// <param name="value">Directory path like "C:\test" or "%AppData%\test".</param>
-    /// <param name="cultureInfo">Culture to use for validation.</param>
-    /// <returns>True if the directory path is valid.</returns>
+    /// Validates whether the specified value represents a valid directory path, allowing for the inclusion of
+    /// environment variables like %UserProfile%.
+    /// </summary>    
+    /// <param name="value">The value to validate as a directory path. May include environment variable references. Can be a string or an
+    /// object convertible to a string.</param>
+    /// <param name="cultureInfo">The culture-specific information relevant to the validation process. This parameter is not used in this
+    /// implementation.</param>
+    /// <returns>A ValidationResult that indicates whether the value is a valid directory path. Returns
+    /// ValidationResult.ValidResult if the value is valid; otherwise, returns a ValidationResult with an error message.</returns>
     public override ValidationResult Validate(object value, CultureInfo cultureInfo)
     {
-        var path = Environment.ExpandEnvironmentVariables((string)value);
+        var path = $"{value}";
 
-        return new Regex(RegexHelper.FilePathRegex, RegexOptions.IgnoreCase).IsMatch(path)
+        return RegexHelper.DirectoryPathWithEnvironmentVariablesRegex().IsMatch(path) || RegexHelper.UncPathRegex().IsMatch(path)
             ? ValidationResult.ValidResult
-            : new ValidationResult(false, Strings.EnterValidFilePath);
+            : new ValidationResult(false, Strings.EnterValidFolderPath);
     }
-}
+}

Source/NETworkManager.Validators/DirectoryPathWithEnvironmentVariablesValidator.cs

@@ -8,10 +8,6 @@
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <PlatformTarget>x64</PlatformTarget>
         <SelfContained>false</SelfContained>
-        <!-- Publish a single file can't be used when accessing assembly file path
-        <PublishSingleFile>true</PublishSingleFile>
-        <PublishReadyToRun>true</PublishReadyToRun>
-        -->		
         <CsWinRTWindowsMetadata>sdk</CsWinRTWindowsMetadata>        
         <UseWPF>true</UseWPF>
         <UseWindowsForms>true</UseWindowsForms>		
@@ -74,8 +70,7 @@
         <PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="6.2.1" />
         <PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.2.1" />
         <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3650.58" />
-        <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-        
+        <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />        
         <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.4" />

Source/NETworkManager/NETworkManager.csproj

@@ -13,6 +13,9 @@ namespace NETworkManager.ViewModels;
 public class SettingsSettingsViewModel : ViewModelBase
 {
     #region Variables
+    /// <summary>
+    /// Gets or sets the action to execute when the associated object is closed.
+    /// </summary>    
     public Action CloseAction { get; set; }
 
     /// <summary>
@@ -143,6 +146,9 @@ public int MaximumNumberOfBackups
 
     #region Constructor, LoadSettings
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SettingsSettingsViewModel" /> class and loads the current settings.
+    /// </summary>    
     public SettingsSettingsViewModel()
     {
         _isLoading = true;
@@ -152,14 +158,13 @@ public SettingsSettingsViewModel()
         _isLoading = false;
     }
 
+    /// <summary>
+    /// Loads the application settings from the current settings folder location.
+    /// </summary>    
     private void LoadSettings()
     {
         Location = SettingsManager.GetSettingsFolderLocation();
         IsDefaultLocation = string.Equals(Location, SettingsManager.GetDefaultSettingsFolderLocation(), StringComparison.OrdinalIgnoreCase);
-
-        Debug.WriteLine(Location);
-        Debug.WriteLine(SettingsManager.GetDefaultSettingsFolderLocation());
-
         IsDailyBackupEnabled = SettingsManager.Current.Settings_IsDailyBackupEnabled;
         MaximumNumberOfBackups = SettingsManager.Current.Settings_MaximumNumberOfBackups;
     }
@@ -168,15 +173,27 @@ private void LoadSettings()
 
     #region ICommands & Actions
 
+    /// <summary>
+    /// Gets the command that opens a location when executed.
+    /// </summary>    
     public ICommand OpenLocationCommand => new RelayCommand(_ => OpenLocationAction());
 
+    /// <summary>
+    /// Opens the settings folder location in Windows Explorer.
+    /// </summary>    
     private static void OpenLocationAction()
     {
         Process.Start("explorer.exe", SettingsManager.GetSettingsFolderLocation());
     }
 
+    /// <summary>
+    /// Gets the command that resets the application settings to their default values.
+    /// </summary>    
     public ICommand ResetSettingsCommand => new RelayCommand(_ => ResetSettingsAction());
 
+    /// <summary>
+    /// Resets the application settings to their default values.
+    /// </summary>    
     private void ResetSettingsAction()
     {
         ResetSettings().ConfigureAwait(false);
@@ -185,8 +202,18 @@ private void ResetSettingsAction()
     #endregion
 
     #region Methods
+    /// <summary>
+    /// Gets the command that opens the location folder selection dialog.
+    /// </summary>    
     public ICommand BrowseLocationFolderCommand => new RelayCommand(p => BrowseLocationFolderAction());
 
+    /// <summary>
+    /// Opens a dialog that allows the user to select a folder location and updates the Location property with the
+    /// selected path if the user confirms the selection.
+    /// </summary>
+    /// <remarks>If the Location property is set to a valid directory path, it is pre-selected in the dialog.
+    /// This method does not return a value and is intended for use in a user interface context where folder selection
+    /// is required.</remarks>
     private void BrowseLocationFolderAction()
     {
         using var dialog = new System.Windows.Forms.FolderBrowserDialog();
@@ -200,13 +227,28 @@ private void BrowseLocationFolderAction()
             Location = dialog.SelectedPath;
     }
 
+    /// <summary>
+    /// Sets the location path based on the provided drag-and-drop input.
+    /// </summary>
+    /// <param name="path">The path to set as the location. This value cannot be null or empty.</param>
     public void SetLocationPathFromDragDrop(string path)
     {
         Location = path;
     }
 
+    /// <summary>
+    /// Gets the command that initiates the action to change the location.
+    /// </summary>    
     public ICommand ChangeLocationCommand => new RelayCommand(_ => ChangeLocationAction().ConfigureAwait(false));
 
+    /// <summary>
+    /// Prompts the user to confirm and then changes the location of the application's settings folder.
+    /// </summary>
+    /// <remarks>This method displays a confirmation dialog to the user before changing the settings folder
+    /// location. If the user confirms, it saves the current settings, updates the settings folder location, and
+    /// restarts the application to apply the changes. No action is taken if the user cancels the confirmation
+    /// dialog.</remarks>
+    /// <returns>A task that represents the asynchronous operation.</returns>
     private async Task ChangeLocationAction()
     {
         var result = await DialogHelper.ShowConfirmationMessageAsync(Application.Current.MainWindow,
@@ -230,8 +272,19 @@ private async Task ChangeLocationAction()
         (Application.Current.MainWindow as MainWindow)?.RestartApplication();
     }
 
+    /// <summary>
+    /// Gets the command that restores the default location settings asynchronously.
+    /// </summary>    
     public ICommand RestoreDefaultLocationCommand => new RelayCommand(_ => RestoreDefaultLocationActionAsync().ConfigureAwait(false));
 
+    /// <summary>
+    /// Restores the application's settings folder location to the default path after obtaining user confirmation.
+    /// </summary>
+    /// <remarks>This method prompts the user to confirm the restoration of the default settings location. If
+    /// the user confirms, it saves the current settings, clears any custom location, and restarts the application to
+    /// apply the changes. Use this method when you want to revert to the default settings folder and ensure all changes
+    /// are properly saved and applied.</remarks>
+    /// <returns>A task that represents the asynchronous operation.</returns>
     private async Task RestoreDefaultLocationActionAsync()
     {
         var result = await DialogHelper.ShowConfirmationMessageAsync(Application.Current.MainWindow,
@@ -255,6 +308,13 @@ private async Task RestoreDefaultLocationActionAsync()
         (Application.Current.MainWindow as MainWindow)?.RestartApplication();
     }
 
+    /// <summary>
+    /// Resets the application settings to their default values and restarts the application after user confirmation.
+    /// </summary>
+    /// <remarks>Displays a confirmation dialog to the user before proceeding. If the user confirms, the
+    /// settings are reinitialized to their defaults and the application is restarted. No action is taken if the user
+    /// cancels the confirmation dialog.</remarks>
+    /// <returns>A task that represents the asynchronous operation.</returns>
     private async Task ResetSettings()
     {
         var result = await DialogHelper.ShowConfirmationMessageAsync(Application.Current.MainWindow,

Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs

@@ -38,11 +38,11 @@
                     </Style.Triggers>
                 </Style>
             </TextBox.Style>
-
             <TextBox.Text>
                 <Binding Path="Location" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
                         <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
+                        <validators:DirectoryPathWithEnvironmentVariablesValidator ValidatesOnTargetUpdated="True" />
                     </Binding.ValidationRules>
                 </Binding>
             </TextBox.Text>
@@ -67,11 +67,19 @@
                         </Style.Triggers>
                     </Style>
                 </StackPanel.Style>
-                <Button Style="{StaticResource ImageWithTextButton}"
-                        Command="{Binding ChangeLocationCommand}"
+                <Button Command="{Binding ChangeLocationCommand}"
                         Visibility="{Binding IsLocationChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
                         HorizontalAlignment="Left" 
                         Margin="0,0,10,0" >
+                    <Button.Style>
+                        <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxLocation}" Value="True">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
                     <Button.Content>
                         <Grid>
                             <Grid.ColumnDefinitions>

Source/NETworkManager/Views/SettingsSettingsView.xaml

@@ -24,7 +24,7 @@ This setting can be controlled by administrators using a system-wide policy. See
 **Policy Property:** `SettingsFolderLocation`
 
 **Values:**
-- Absolute path (e.g., `C:\\CustomPath\\NETworkManager\\Settings`) - Force a custom settings folder location for all users
+- Path like `C:\\Path\\To\\Settings` or `%UserProfile%\\NETworkManager\\Settings` - Force a custom settings folder location for all users
 - Omit the property - Allow the default location logic to apply (portable vs. non-portable)
 
 **Example:**