From 1902bd6240152969afed2fd7ae766cff07f5fb74 Mon Sep 17 00:00:00 2001
From: Micah Morrison <micahmorrison95@gmail.com>
Date: Sat, 11 Feb 2023 18:41:08 -0500
Subject: [PATCH 1/4] Improve client config UI

---
 .../ClientConfigurationEditorWindow.xaml      |  46 ++++++++++++++----
 .../ClientConfigurationEditorWindow.xaml.cs   |  17 +++++++
 WgServerforWindows/Models/AppSettings.cs      |   7 +++
 .../Models/ClientConfiguration.cs             |  18 +++++++
 .../Models/ClientConfigurationList.cs         |  29 ++++++++++-
 .../ClientConfigurationsPrerequisite.cs       |  12 +++++
 .../Properties/Resources.Designer.cs          |  36 ++++++++++++++
 WgServerforWindows/Properties/Resources.resx  |  12 +++++
 WgServerforWindows/WgServerforWindows.csproj  |   6 +++
 WgServerforWindows/lib/ExplorerSearchBox.dll  | Bin 0 -> 17408 bytes
 10 files changed, 172 insertions(+), 11 deletions(-)
 create mode 100644 WgServerforWindows/lib/ExplorerSearchBox.dll

diff --git a/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml b/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml
index cb2ae35..dd76ce9 100644
--- a/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml
+++ b/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml
@@ -7,6 +7,8 @@
         xmlns:properties="clr-namespace:WgServerforWindows.Properties"
         xmlns:controls="clr-namespace:WgServerforWindows.Controls"
         xmlns:converters="clr-namespace:WgServerforWindows.Converters"
+        xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
+        xmlns:esb="clr-namespace:ExplorerSearchBox;assembly=ExplorerSearchBox"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=models:ClientConfigurationList}"
         Width="600" Height="600"
@@ -14,6 +16,7 @@
 
     <Grid>
         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
             <ColumnDefinition/>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="Auto"/>
@@ -25,30 +28,53 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <Grid Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3">
+        <Grid Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="4">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="40" />
+                <ColumnDefinition Width="40" />
+                <ColumnDefinition Width="5" />
             </Grid.ColumnDefinitions>
 
-            <Button Grid.Column="1" Grid.Row="0" Margin="0,10,0,10" Content="{x:Static properties:Resources.AddClient}" Command="{Binding AddClientConfigurationCommand}"/>
+            <Button Grid.Column="0" Grid.Row="0" Margin="10,10,5,10" Height="30" Content="{x:Static properties:Resources.AddClient}" Command="{Binding AddClientConfigurationCommand}"/>
+            <esb:ExplorerSearchBox Grid.Column="1" Margin="5,0,5,0" FocusManager.IsFocusScope="True" HintText="Filter" VerticalAlignment="Center" HorizontalAlignment="Stretch" SearchRequested="ExplorerSearchBox_SearchRequested" />
+            <Button Grid.Column="2" Grid.Row="0" Margin="5,10,5,10" Content="+" FontSize="15" ToolTip="{x:Static properties:Resources.ExpandAll}" Command="{Binding ExpandAllConfigurationsCommand}"/>
+            <Button Grid.Column="3" Grid.Row="0" Margin="5,10,5,10" Content="-" FontSize="15" ToolTip="{x:Static properties:Resources.CollapseAll}" Command="{Binding CollapseAllConfigurationsCommand}"/>
         </Grid>
 
-        <ScrollViewer Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Auto">
+        <ScrollViewer Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="4" VerticalScrollBarVisibility="Visible">
             <ItemsControl ItemsSource="{Binding List}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Vertical">
-                            <Canvas Height="10" Margin="20" Background="LightGray"/>
-                            <controls:ConfigurationEditorControl DataContext="{Binding}"/>
+                            <Expander IsExpanded="{Binding IsExpanded}" Margin="0,0,0,0" Visibility="{c:Binding IsVisible, FalseToVisibility=Collapsed}">
+                                <Expander.Header>
+                                    <Grid HorizontalAlignment="{Binding HorizontalAlignment, RelativeSource={RelativeSource AncestorType=ContentPresenter}, Mode=OneWayToSource}"
+                                          Margin="-23,-3,0,0"  Background="LightGray">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="20"/>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="20"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Grid.Column="0" Text="{c:Binding 'IsExpanded ? ExpandedSymbol : CollapsedSymbol'}" VerticalAlignment="Center" TextAlignment="Center" FontWeight="Bold" TextTrimming="CharacterEllipsis"/>
+                                        <TextBlock Grid.Column="2" Text="{Binding NameProperty.Value}" TextAlignment="Center" FontWeight="Bold" FontSize="13" Padding="5" />
+                                    </Grid>
+                                </Expander.Header>
+                                <Grid Margin="0,5,0,0">
+                                    <controls:ConfigurationEditorControl DataContext="{Binding}"/>
+                                </Grid>
+                            </Expander>
                         </StackPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
         </ScrollViewer>
 
-        <Button Grid.Column="1" Grid.Row="2" Margin="10,10,5,10" Padding="10,5,10,5" HorizontalAlignment="Right" Content="{x:Static properties:Resources.Cancel}" Click="CancelButton_Click"/>
-        <Button Grid.Column="2" Grid.Row="2" Margin="5,10,10,10" Padding="10,5,10,5" HorizontalAlignment="Right" Content="{x:Static properties:Resources.Save}" Click="SaveButton_Click"/>
+        <Label Grid.Column="0" Grid.Row="2" Content="{Binding CountString}" Padding="10,5,10,10" VerticalContentAlignment="Bottom"/>
+        <Button Grid.Column="2" Grid.Row="2" Margin="10,10,5,10" Padding="10,5,10,5" HorizontalAlignment="Right" Content="{x:Static properties:Resources.Cancel}" Click="CancelButton_Click"/>
+        <Button Grid.Column="3" Grid.Row="2" Margin="5,10,10,10" Padding="10,5,10,5" HorizontalAlignment="Right" Content="{x:Static properties:Resources.Save}" Click="SaveButton_Click"/>
     </Grid>
 </Window>
diff --git a/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml.cs b/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml.cs
index da85812..e544443 100644
--- a/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml.cs
+++ b/WgServerforWindows/Controls/ClientConfigurationEditorWindow.xaml.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using WgServerforWindows.Models;
 
 namespace WgServerforWindows.Controls
 {
@@ -34,5 +36,20 @@ private void CancelButton_Click(object sender, RoutedEventArgs e)
         }
 
         #endregion
+
+        private void ExplorerSearchBox_SearchRequested(object sender, string e)
+        {
+            if (DataContext is ClientConfigurationList clientConfigurationList)
+            {
+                clientConfigurationList.List.ToList().ForEach(c => c.IsVisible = true);
+
+                if (!string.IsNullOrWhiteSpace(e))
+                {
+                    clientConfigurationList.List.Where(c => !c.Name.Contains(e, StringComparison.OrdinalIgnoreCase)).ToList().ForEach(c => c.IsVisible = false);
+                }
+
+                clientConfigurationList.RaisePropertyChanged(nameof(clientConfigurationList.CountString));
+            }
+        }
     }
 }
diff --git a/WgServerforWindows/Models/AppSettings.cs b/WgServerforWindows/Models/AppSettings.cs
index dd428d1..6b6f02f 100644
--- a/WgServerforWindows/Models/AppSettings.cs
+++ b/WgServerforWindows/Models/AppSettings.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Windows;
 using GalaSoft.MvvmLight;
@@ -47,6 +48,7 @@ public void Load()
             Tracker.Configure<AppSettings>()
                 .Property(a => a.CustomServerConfigDirectory)
                 .Property(a => a.CustomClientConfigDirectory)
+                .Property(a => a.ClientConfigurationExpansionStates)
                 .Track(this);
         }
 
@@ -79,6 +81,11 @@ public string CustomClientConfigDirectory
         }
         private string _customClientConfigDirectory;
 
+        /// <summary>
+        /// Tracks whether each client configuration is expanded in the UI or not
+        /// </summary>
+        public Dictionary<string, bool> ClientConfigurationExpansionStates = new Dictionary<string, bool>();
+
         /// <summary>
         /// The public tracker instance. Can be used to track things other than the <see cref="Instance"/>.
         /// </summary>
diff --git a/WgServerforWindows/Models/ClientConfiguration.cs b/WgServerforWindows/Models/ClientConfiguration.cs
index 9594bef..2215918 100644
--- a/WgServerforWindows/Models/ClientConfiguration.cs
+++ b/WgServerforWindows/Models/ClientConfiguration.cs
@@ -448,6 +448,24 @@ public ClientConfiguration(ClientConfigurationList parentList)
         });
         private RelayCommand _removeClientCommand;
 
+        public bool IsVisible
+        {
+            get => _isVisible;
+            set => Set(nameof(IsVisible), ref _isVisible, value);
+        }
+        private bool _isVisible = true;
+
+        public bool IsExpanded
+        {
+            get => _isExpanded;
+            set => Set(nameof(IsExpanded), ref _isExpanded, value);
+        }
+        private bool _isExpanded = true;
+
+        public string ExpandedSymbol => "▼";
+
+        public string CollapsedSymbol => "▶";
+
         #endregion
 
         #region Private fields
diff --git a/WgServerforWindows/Models/ClientConfigurationList.cs b/WgServerforWindows/Models/ClientConfigurationList.cs
index 0ac005c..408d0da 100644
--- a/WgServerforWindows/Models/ClientConfigurationList.cs
+++ b/WgServerforWindows/Models/ClientConfigurationList.cs
@@ -1,14 +1,29 @@
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows.Input;
 using System.Windows.Threading;
+using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using WgServerforWindows.Properties;
 
 namespace WgServerforWindows.Models
 {
-    public class ClientConfigurationList
+    public class ClientConfigurationList : ObservableObject
     {
+        public ClientConfigurationList()
+        {
+            List.CollectionChanged += (_, __) =>
+            {
+                RaisePropertyChanged(nameof(CountString));
+            };
+        }
+        
         public ObservableCollection<ClientConfiguration> List { get; } = new ObservableCollection<ClientConfiguration>();
 
+        public string CountString => List.Any(c => !c.IsVisible) 
+            ? string.Format(Resources.FilteredClientCount, List.Count(c => c.IsVisible), List.Count) 
+            : string.Format(Resources.ClientCount, List.Count);
+
         public ICommand AddClientConfigurationCommand => _addClientConfigurationCommand ??= new RelayCommand(() =>
         {
             using (new WaitCursor(dispatcherPriority: DispatcherPriority.Render, restoreCursorToNull: true))
@@ -17,5 +32,17 @@ public class ClientConfigurationList
             }
         });
         private RelayCommand _addClientConfigurationCommand;
+
+        public ICommand ExpandAllConfigurationsCommand => _expandAllConfigurationsCommand ??= new RelayCommand(() =>
+        {
+            List.ToList().ForEach(c => c.IsExpanded = true);
+        });
+        private RelayCommand _expandAllConfigurationsCommand;
+
+        public ICommand CollapseAllConfigurationsCommand => _collapseAllConfigurationsCommand ??= new RelayCommand(() =>
+        {
+            List.ToList().ForEach(c => c.IsExpanded = false);
+        });
+        private RelayCommand _collapseAllConfigurationsCommand;
     }
 }
diff --git a/WgServerforWindows/Models/ClientConfigurationsPrerequisite.cs b/WgServerforWindows/Models/ClientConfigurationsPrerequisite.cs
index 951823b..f9db20e 100644
--- a/WgServerforWindows/Models/ClientConfigurationsPrerequisite.cs
+++ b/WgServerforWindows/Models/ClientConfigurationsPrerequisite.cs
@@ -104,6 +104,14 @@ public override void Configure()
                 clientConfigurations.List.Add(clientConfiguration);
             }
 
+            clientConfigurations.List.ToList().ForEach(c =>
+            {
+                if (AppSettings.Instance.ClientConfigurationExpansionStates.TryGetValue(c.Name, out bool expansionState))
+                {
+                    c.IsExpanded = expansionState;
+                }
+            });
+
             ClientConfigurationEditorWindow clientConfigurationEditorWindow = new ClientConfigurationEditorWindow {DataContext = clientConfigurations};
 
             WaitCursor.SetOverrideCursor(Cursors.Wait);
@@ -184,6 +192,10 @@ public override void Configure()
                 WaitCursor.SetOverrideCursor(null);
             }
 
+            AppSettings.Instance.ClientConfigurationExpansionStates.Clear();
+            clientConfigurations.List.ToList().ForEach(c => AppSettings.Instance.ClientConfigurationExpansionStates[c.Name] = c.IsExpanded);
+            AppSettings.Instance.Save();
+
             Refresh();
         }
 
diff --git a/WgServerforWindows/Properties/Resources.Designer.cs b/WgServerforWindows/Properties/Resources.Designer.cs
index 2fa502b..c2c811f 100644
--- a/WgServerforWindows/Properties/Resources.Designer.cs
+++ b/WgServerforWindows/Properties/Resources.Designer.cs
@@ -231,6 +231,15 @@ public static string ClientConfigurationTitle {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Count: {0}.
+        /// </summary>
+        public static string ClientCount {
+            get {
+                return ResourceManager.GetString("ClientCount", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Populate from Server.
         /// </summary>
@@ -249,6 +258,15 @@ public static string Close {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Collapse all.
+        /// </summary>
+        public static string CollapseAll {
+            get {
+                return ResourceManager.GetString("CollapseAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Confirm.
         /// </summary>
@@ -423,6 +441,15 @@ public static string Error {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Expand all.
+        /// </summary>
+        public static string ExpandAll {
+            get {
+                return ResourceManager.GetString("ExpandAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Export Configuration File.
         /// </summary>
@@ -441,6 +468,15 @@ public static string FailedToIdentify {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Count: {0} (filtered from: {1}).
+        /// </summary>
+        public static string FilteredClientCount {
+            get {
+                return ResourceManager.GetString("FilteredClientCount", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Generate an IP in the range defined by the server address (currently: {0}).
         /// </summary>
diff --git a/WgServerforWindows/Properties/Resources.resx b/WgServerforWindows/Properties/Resources.resx
index c5d57ef..4eb8b46 100644
--- a/WgServerforWindows/Properties/Resources.resx
+++ b/WgServerforWindows/Properties/Resources.resx
@@ -545,4 +545,16 @@ Note: It is preferable to use a domain name with DDNS to avoid dynamic WAN IPs.<
   <data name="AllowedRoutableIpsProperty" xml:space="preserve">
     <value>Allowed IPs</value>
   </data>
+  <data name="ExpandAll" xml:space="preserve">
+    <value>Expand all</value>
+  </data>
+  <data name="CollapseAll" xml:space="preserve">
+    <value>Collapse all</value>
+  </data>
+  <data name="FilteredClientCount" xml:space="preserve">
+    <value>Count: {0} (filtered from: {1})</value>
+  </data>
+  <data name="ClientCount" xml:space="preserve">
+    <value>Count: {0}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WgServerforWindows/WgServerforWindows.csproj b/WgServerforWindows/WgServerforWindows.csproj
index 5dd5dda..4edaca7 100644
--- a/WgServerforWindows/WgServerforWindows.csproj
+++ b/WgServerforWindows/WgServerforWindows.csproj
@@ -52,6 +52,12 @@
     <ProjectReference Include="..\WgServerforWindows.Cli.Options\WgServerforWindows.Cli.Options.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="ExplorerSearchBox">
+      <HintPath>lib\ExplorerSearchBox.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Images\cancel.png" />
     <Resource Include="Images\checked.png" />
diff --git a/WgServerforWindows/lib/ExplorerSearchBox.dll b/WgServerforWindows/lib/ExplorerSearchBox.dll
new file mode 100644
index 0000000000000000000000000000000000000000..d3928f0a3b17224cc7de1ef5657dddb19e82162b
GIT binary patch
literal 17408
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

literal 0
HcmV?d00001


From 3c3ea12b1b3f91bebf2ca42eafa46631de63c18e Mon Sep 17 00:00:00 2001
From: Micah Morrison <micahmorrison95@gmail.com>
Date: Sat, 11 Feb 2023 22:54:26 -0500
Subject: [PATCH 2/4] Update screenshot for client configuration

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4926e80..1bd5248 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ In addition to creating/udpating the configuration file for the server endpoint,
 You should set the Endpoint property to your public IPv4, IPv6, or domain address, followed by whatever port you have forwarded. The `Detect Public IP Address` button will attempt to detect your public address automatically using the [ipify.org](https://ipify.org) API. However, if possible, it is recommended that you use a domain name with DDNS. That way, if your public IP address changes, your clients will be able to find your server endpoint without reconfiguration.
 
 ### Client Configuration
-![ClientConfiguration](https://user-images.githubusercontent.com/7417301/173172783-5a16da01-f725-4a47-b738-1e52f79f49cd.png)
+![ClientConfiguration](https://user-images.githubusercontent.com/7417301/218290866-f36b8bda-208f-4dfd-a66f-40e5b960b0af.png)
 
 Here you can configure the client(s). The Address can be entered manually or calculated based on the server's network range. For example, if the server's network is `10.253.0.0/24`, the client config can determine that `10.253.0.2` is a valid address. Note that the first address in the range (in this example, `10.253.0.1`) is reserved for the server. DNS is optional, but recommended. You may add DNS Search Domains (also known as DNS Suffixes, [read more](https://en.wikipedia.org/wiki/Search_domain)). Lastly, the Private Key, Public Key, and Preshared Key are generated using `wg genkey`, `wg pubkey [private key]`, and `wg genpsk`. (You may specify your own Private Key. Preshared Keys are optional, generated uniquely per-client, and shared with the server's configuration. See [#34](https://github.com/micahmo/WgServerforWindows/issues/34) for more info.)
 

From fa3c86dccc123af0c855afbb37dbf9d7bfee89f1 Mon Sep 17 00:00:00 2001
From: Micah Morrison <micahmorrison95@gmail.com>
Date: Sat, 11 Feb 2023 23:02:56 -0500
Subject: [PATCH 3/4] Create server config file before editing clients

---
 .../Models/ClientConfiguration.cs             |  1 +
 .../Models/ServerConfigurationPrerequisite.cs | 51 +++++++++----------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/WgServerforWindows/Models/ClientConfiguration.cs b/WgServerforWindows/Models/ClientConfiguration.cs
index 2215918..81a0ea3 100644
--- a/WgServerforWindows/Models/ClientConfiguration.cs
+++ b/WgServerforWindows/Models/ClientConfiguration.cs
@@ -37,6 +37,7 @@ public ClientConfiguration(ClientConfigurationList parentList)
             PublicKeyProperty.TargetTypes.Add(typeof(ServerConfiguration));
             ServerPersistentKeepaliveProperty.TargetTypes.Add(typeof(ServerConfiguration));
 
+            ServerConfigurationPrerequisite.EnsureConfigFile();
             var serverConfiguration = new ServerConfiguration().Load<ServerConfiguration>(Configuration.LoadFromFile(ServerConfigurationPrerequisite.ServerDataPath));
             string serverIp = serverConfiguration.AddressProperty.Value;
             string allowedIpsDefault = serverConfiguration.AllowedIpsProperty.Value;
diff --git a/WgServerforWindows/Models/ServerConfigurationPrerequisite.cs b/WgServerforWindows/Models/ServerConfigurationPrerequisite.cs
index 81949e9..95694b5 100644
--- a/WgServerforWindows/Models/ServerConfigurationPrerequisite.cs
+++ b/WgServerforWindows/Models/ServerConfigurationPrerequisite.cs
@@ -77,33 +77,7 @@ public ServerConfigurationPrerequisite(
 
         public override void Resolve()
         {
-            if (Directory.Exists(Path.GetDirectoryName(ServerDataPath)) == false)
-            {
-                Directory.CreateDirectory(Path.GetDirectoryName(ServerDataPath));
-            }
-
-            if (File.Exists(ServerDataPath) == false)
-            {
-#pragma warning disable CS0642
-                // There is intentionally no code block after the using statement,
-                // because we want to create and then release the file without holding it open.
-                using (File.Create(ServerDataPath));
-#pragma warning restore CS0642
-            }
-
-            if (Directory.Exists(Path.GetDirectoryName(ServerWGPath)) == false)
-            {
-                Directory.CreateDirectory(Path.GetDirectoryName(ServerWGPath));
-            }
-
-            if (File.Exists(ServerWGPath) == false)
-            {
-#pragma warning disable CS0642
-                // There is intentionally no code block after the using statement,
-                // because we want to create and then release the file without holding it open.
-                using (File.Create(ServerWGPath));
-#pragma warning restore CS0642
-            }
+            EnsureConfigFile();
 
             Configure();
         }
@@ -236,6 +210,29 @@ private void SaveWG(ServerConfiguration serverConfiguration)
 
         #region Public static methods
 
+        public static void EnsureConfigFile()
+        {
+            if (Directory.Exists(Path.GetDirectoryName(ServerDataPath)) == false)
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(ServerDataPath));
+            }
+
+            if (File.Exists(ServerDataPath) == false)
+            {
+                File.Create(ServerDataPath).Dispose();
+            }
+
+            if (Directory.Exists(Path.GetDirectoryName(ServerWGPath)) == false)
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(ServerWGPath));
+            }
+
+            if (File.Exists(ServerWGPath) == false)
+            {
+                File.Create(ServerWGPath).Dispose();
+            }
+        }
+
         public static Network GetNetwork(TimeSpan? timeout = null)
         {
             Network result = default;

From 5c5c42995088413ba6c3771d5a0f74d519794419 Mon Sep 17 00:00:00 2001
From: micahmo <micahmo@users.noreply.github.com>
Date: Mon, 13 Feb 2023 12:45:58 +0000
Subject: [PATCH 4/4] Bump version to 2.0.7

---
 Directory.Build.props                      |  6 +++---
 Installer/WS4WSetupScript.iss              |  2 +-
 WireGuardServerForWindows/VersionInfo2.xml | 11 ++++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index cbb765b..14a1de1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <!-- Keep in sync with WS4WSetupScript.iss and VersionInfo.xml -->
-        <AssemblyVersion>2.0.6.0</AssemblyVersion>
-        <FileVersion>2.0.6.0</FileVersion>
-        <InformationalVersion>2.0.6.0</InformationalVersion>
+        <AssemblyVersion>2.0.7.0</AssemblyVersion>
+        <FileVersion>2.0.7.0</FileVersion>
+        <InformationalVersion>2.0.7.0</InformationalVersion>
         <Authors>Micah Morrison</Authors>
         <Product>WS4W</Product>
     </PropertyGroup>
diff --git a/Installer/WS4WSetupScript.iss b/Installer/WS4WSetupScript.iss
index 7f3793e..794f68a 100644
--- a/Installer/WS4WSetupScript.iss
+++ b/Installer/WS4WSetupScript.iss
@@ -1,6 +1,6 @@
 #define MyAppNameOld "WireGuard Server For Windows"
 #define MyAppName "Wg Server for Windows"
-#define MyAppVersion "2.0.6"
+#define MyAppVersion "2.0.7"
 #define MyAppPublisher "Micah Morrison"
 #define MyAppURL "https://github.com/micahmo/WgServerforWindows"
 #define MyAppExeName "WgServerforWindows.exe"
diff --git a/WireGuardServerForWindows/VersionInfo2.xml b/WireGuardServerForWindows/VersionInfo2.xml
index 77f00d1..ea7ec21 100644
--- a/WireGuardServerForWindows/VersionInfo2.xml
+++ b/WireGuardServerForWindows/VersionInfo2.xml
@@ -2,12 +2,13 @@
 <!-- Things to update: Version, Date, Release Notes -->
 <AppUpdate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/micahmo/WgServerforWindows/master/WireGuardServerForWindows/AppUpdate.xsd">
-  <Version>2.0.6.0</Version>
-  <ReleaseDate>2023-02-03</ReleaseDate>
+  <Version>2.0.7.0</Version>
+  <ReleaseDate>2023-02-13</ReleaseDate>
   <!-- Default download -->
-  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.6/WS4WSetup-2.0.6.exe</DownloadLink>
-  <DownloadFileName>WS4WSetup-2.0.6.exe</DownloadFileName>
+  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.7/WS4WSetup-2.0.7.exe</DownloadLink>
+  <DownloadFileName>WS4WSetup-2.0.7.exe</DownloadFileName>
   <!-- Release notes -->
-  <VersionNotes> - Allow setting client public key without having private key (#76)</VersionNotes>
+  <VersionNotes> - Improve client configuration UI (expand/collapse/filter/count)
+ - Fix issue were clients could not be configured before server</VersionNotes>
   <ReleaseNotes></ReleaseNotes>
 </AppUpdate>