Fix: Allow path with special chars (#1611)

* Fix: Path with special chars

* Docs: Add #1611

* Fix: Only allow export for all results

* Docs: Add #1611

Author: BornToBeRoot

Source/NETworkManager.Utilities/RegexHelper.cs

@@ -85,6 +85,6 @@ public static class RegexHelper
         public const string FilePath = @"^(?:[\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 FullName = @"^(?:[\w]\:|\\)(\\[a-z_\-\s0-9\.]+)+\.[a-zA-z0-9]{1,4}$";
+        public const string FullName = @"^(?:[\w]\:|\\)(\\[a-zA-Z0-9_\-\s\.()~!@#$%^&=+';,{}\[\]]+)+\.[a-zA-z0-9]{1,4}$";
     }
 }

Source/NETworkManager/ViewModels/ExportViewModel.cs

@@ -293,12 +293,12 @@ private void ChangeFilePathExtension(ExportManager.ExportFileType fileType)
 
             var extension = Path.GetExtension(FilePath).Replace(".", "");
 
-            if (extension.Equals(ExportManager.GetFileExtensionAsString(fileType), StringComparison.CurrentCultureIgnoreCase))
-                return;
+            var newExtension = ExportManager.GetFileExtensionAsString(fileType);
 
-            FilePath = FilePath.Substring(0, FilePath.Length - extension.Length);
+            if (extension.Equals(newExtension, StringComparison.CurrentCultureIgnoreCase))
+                return;
 
-            FilePath += ExportManager.GetFileExtensionAsString(fileType).ToLower();
+            FilePath = FilePath[..^extension.Length] + newExtension.ToLower();
         }
     }
 }

Source/NETworkManager/ViewModels/PingMonitorViewModel.cs

@@ -307,7 +307,7 @@ public async Task Export()
 
                 SettingsManager.Current.PingMonitor_ExportFileType = instance.FileType;
                 SettingsManager.Current.PingMonitor_ExportFilePath = instance.FilePath;
-            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, new ExportManager.ExportFileType[] { ExportManager.ExportFileType.CSV, ExportManager.ExportFileType.XML, ExportManager.ExportFileType.JSON }, true, SettingsManager.Current.PingMonitor_ExportFileType, SettingsManager.Current.PingMonitor_ExportFilePath);
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, new ExportManager.ExportFileType[] { ExportManager.ExportFileType.CSV, ExportManager.ExportFileType.XML, ExportManager.ExportFileType.JSON }, false, SettingsManager.Current.PingMonitor_ExportFileType, SettingsManager.Current.PingMonitor_ExportFilePath);
 
             customDialog.Content = new ExportDialog
             {

docs/Changelog/next-release.md

@@ -47,12 +47,16 @@ permalink: /Changelog/next-release
   - Handle null exception properly [#1510](https://github.com/BornToBeRoot/NETworkManager/pull/1510){:target="\_blank"}
 - Traceroute
   - Hops were skipped if they did not respond to ping [#1528](https://github.com/BornToBeRoot/NETworkManager/pull/1528){:target="\_blank"}
+- Ping Monitor
+  - Allow export of all results only (hide other option in dialog as it has no effect) [#1611](https://github.com/BornToBeRoot/NETworkManager/pull/1611){:target="\_blank"}
 - Ping Monitor, Traceroute & SNMP
   - IPv6 is now resolved when selected in the settings [#1529](https://github.com/BornToBeRoot/NETworkManager/pull/1529){:target="\_blank"}
 - Remote Desktop, PowerShell, PuTTY & TigerVNC
   - "Unlock profile" dialog is now displayed correctly if an embedded window is already open [#1515](https://github.com/BornToBeRoot/NETworkManager/pull/1515){:target="\_blank"}
 - PowerShell & TigerVNC
   - Embedded window is now resized correctly after the inital connect [#1515](https://github.com/BornToBeRoot/NETworkManager/pull/1515){:target="\_blank"}
+- Export dialog
+  - The "Export" button was disabled if the path contained special characters [#1611](https://github.com/BornToBeRoot/NETworkManager/pull/1611){:target="\_blank"}
 - Settings > Profiles
   - App crash fixed when a profile file is deleted and an encrypted but locked profile file is selected [#1512](https://github.com/BornToBeRoot/NETworkManager/pull/1512){:target="\_blank"}
   - Reselect group/profile on refresh (e.g. if profiles page is opened again) [#1516](https://github.com/BornToBeRoot/NETworkManager/pull/1516){:target="\_blank"}