config in client suite

Config/Config.vbproj

@@ -73,7 +73,6 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OldConfig.vb" />
     <Compile Include="ConfigManager.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">

Config/ConfigManager.vb

@@ -12,7 +12,7 @@ Public Class ConfigManager(Of T)
     Private ReadOnly _File As Filesystem.File
     Private ReadOnly _UserPath As String
     Private ReadOnly _ComputerPath As String
-    Private ReadOnly _CurrentDataPath As String
+    Private _CurrentDataPath As String
 
     Private ReadOnly _Schema As T
     Private ReadOnly _Serializer As XmlSerializer
@@ -53,25 +53,15 @@ Public Class ConfigManager(Of T)
             Throw New DirectoryNotFoundException($"Path {ComputerConfigPath} does not exist!")
         End If
 
-        If Not Filesystem.File Then Then
+        If Not _File.TestPathIsDirectory(UserConfigPath) Then
-            Throw New DirectoryNotFoundException()
+            Throw New ArgumentException($"Path {UserConfigPath} is not a directory!")
         End If
 
-        If IO.File.Exists(_UserPath) Then
+        If Not _File.TestPathIsDirectory(ComputerConfigPath) Then
-            _Logger.Debug("Loading config from UserPath: {0}", _UserPath)
+            Throw New ArgumentException($"Path {ComputerConfigPath} is not a directory!")
-            _CurrentDataPath = _UserPath
-            _Config = ReadFromFile(_UserPath)
-        ElseIf IO.File.Exists(_ComputerPath) Then
-            _Logger.Debug("Loading config from ComputerPath: {0}", _ComputerPath)
-            _CurrentDataPath = _ComputerPath
-            _Config = ReadFromFile(_ComputerPath)
-        Else
-            _Logger.Debug("Creating default config in UserPath: {0}", _UserPath)
-            _CurrentDataPath = _UserPath
-            _Config = Activator.CreateInstance(_Schema.GetType)
-
-            WriteToFile(_Config, _UserPath)
         End If
+
+        _Config = LoadConfig()
     End Sub
 
     ''' <summary>
@@ -81,6 +71,34 @@ Public Class ConfigManager(Of T)
         WriteToFile(_Config, _UserPath)
     End Sub
 
+    ''' <summary>
+    ''' First check if a user config exists and if it does, load it.
+    ''' If not, check if a systemwide config exists and and if it does, load it.
+    ''' Otherwise, create a user config using the default values from the supplied config class `T`
+    ''' </summary>
+    ''' <returns></returns>
+    Private Function LoadConfig() As T
+        Dim oConfig As T
+
+        If IO.File.Exists(_UserPath) Then
+            _Logger.Debug("Loading config from UserPath: {0}", _UserPath)
+            _CurrentDataPath = _UserPath
+            oConfig = ReadFromFile(_UserPath)
+        ElseIf IO.File.Exists(_ComputerPath) Then
+            _Logger.Debug("Loading config from ComputerPath: {0}", _ComputerPath)
+            _CurrentDataPath = _ComputerPath
+            oConfig = ReadFromFile(_ComputerPath)
+        Else
+            _Logger.Debug("Creating default config in UserPath: {0}", _UserPath)
+            _CurrentDataPath = _UserPath
+            oConfig = Activator.CreateInstance(_Schema.GetType)
+
+            WriteToFile(_Config, _UserPath)
+        End If
+
+        Return oConfig
+    End Function
+
     ''' <summary>
     ''' Serialize a config object to byte array
     ''' </summary>

Config/OldConfig.vb

@@ -1,78 +0,0 @@
-Imports System.IO
-Imports DigitalData.Modules.Logging
-
-Public MustInherit Class OldConfig
-    Private Const _userConfigFileName As String = "UserConfig.xml"
-    Private _logFactory As LogConfig
-    Private _logger As Logger
-
-    Protected Const _configKey As String = "Key"
-    Protected Const _configValue As String = "Value"
-    Protected _dataTable As DataTable
-
-    Protected ReadOnly Property PropertyNames As Dictionary(Of String, String)
-        Get
-            Return New Dictionary(Of String, String)
-        End Get
-    End Property
-
-    Public Sub New(LogConfig As LogConfig)
-        _logFactory = LogConfig
-        _logger = LogConfig.GetLogger()
-
-
-    End Sub
-
-    Private Function GetUserConfigPath() As String
-        Dim oAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
-        Dim oCompanyName = My.Application.Info.CompanyName
-        Dim oProductName = My.Application.Info.ProductName
-
-        Return Path.Combine(oAppData, oCompanyName, oProductName, _userConfigFileName)
-    End Function
-
-    Protected Function LoadConfig() As DataTable
-        Dim oUserConfigPath As String = GetUserConfigPath()
-        Dim oDatatable As New DataTable()
-
-        If Not File.Exists(oUserConfigPath) Then
-            _logger.Warn("Config file {0} does not exist", oUserConfigPath)
-            Return Nothing
-        End If
-
-        Try
-            oDatatable.ReadXml(oUserConfigPath)
-            Return oDatatable
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return Nothing
-        End Try
-    End Function
-
-    Protected Sub SaveConfig(DataTable As DataTable)
-        Dim oUserConfigPath As String = GetUserConfigPath()
-
-        Try
-            DataTable.WriteXml(oUserConfigPath)
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
-
-    Protected Function ConvertToDataTable(dictionary As Dictionary(Of String, String)) As DataTable
-        Dim oNewDataTable As New DataTable("Config")
-        oNewDataTable.Columns.Add(New DataColumn("Key", GetType(String)))
-        oNewDataTable.Columns.Add(New DataColumn("Value", GetType(String)))
-
-        For Each oProperty In dictionary
-            Dim oNewRow = oNewDataTable.NewRow()
-            oNewRow.Item("Key") = oProperty.Key
-            oNewRow.Item("Value") = oProperty.Value
-            oNewDataTable.Rows.Add(oNewRow)
-        Next
-
-        oNewDataTable.AcceptChanges()
-
-        Return oNewDataTable
-    End Function
-End Class

EDMI_ClientSuite/ApplicationEvents.vb

@@ -1,4 +1,5 @@
-Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Logging.LogConfig
 
 Namespace My
@@ -13,7 +14,10 @@ Namespace My
 
         Public Sub App_Startup() Handles Me.Startup
             Dim oLogConfig As New LogConfig(PathType.AppData)
+            Dim oConfigManager As New ConfigManager(Of ClassConfig)(oLogConfig, Windows.Forms.Application.UserAppDataPath, Windows.Forms.Application.CommonAppDataPath)
+
             LogConfig = oLogConfig
+            ConfigManager = oConfigManager
 
             _Logger = LogConfig.GetLogger()
             _Logger.Info("Starting Client Suite..")

EDMI_ClientSuite/ClassConfig.vb

@@ -0,0 +1,3 @@
+Public Class ClassConfig
+    Public Property ServiceConnection As String = String.Empty
+End Class

EDMI_ClientSuite/ClassInit.vb

@@ -1,5 +1,5 @@
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Logging.LogConfig
+Imports DigitalData.Modules.Config
 Imports System.ServiceModel
 Imports EDMI_ClientSuite.NetworkService_DDEDM
 Imports System.ServiceModel.Channels
@@ -19,8 +19,9 @@ Public Class ClassInit
         _Logger = My.LogConfig.GetLogger()
     End Sub
 
-    Public Function TestConnectionURLExists()
+    Public Function TestConnectionURLExists() As Boolean
-        Return My.Settings.ICMServiceAddress <> String.Empty
+        Return My.ConfigManager.Config.ServiceConnection <> String.Empty
+        'Return My.Settings.ICMServiceAddress <> String.Empty
     End Function
 
     Public Async Function TestConnectionAsync(EndpointURL As String) As Task(Of ConnectionTestResult)
@@ -44,7 +45,8 @@ Public Class ClassInit
     End Function
 
     Public Function GetChannelFactory() As IChannelFactory(Of IEDMServiceChannel)
-        Return GetChannelFactory(My.Settings.ICMServiceAddress)
+        'Return GetChannelFactory(My.Settings.ICMServiceAddress)
+        Return GetChannelFactory(My.ConfigManager.Config.ServiceConnection)
     End Function
 
     Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IEDMServiceChannel)

EDMI_ClientSuite/EDMI_ClientSuite.vbproj

@@ -115,6 +115,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApplicationEvents.vb" />
+    <Compile Include="ClassConfig.vb" />
     <Compile Include="ClassConstants.vb" />
     <Compile Include="ClassInit.vb" />
     <Compile Include="ClassLayout.vb" />
@@ -368,6 +369,10 @@
     <None Include="Resources\folder_go.png" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Config\Config.vbproj">
+      <Project>{44982F9B-6116-44E2-85D0-F39650B1EF99}</Project>
+      <Name>Config</Name>
+    </ProjectReference>
     <ProjectReference Include="..\EDMI_FILE_OPs\EDMIFileOps.vbproj">
       <Project>{5b1171dc-fffe-4813-a20d-786aae47b320}</Project>
       <Name>EDMIFileOps</Name>

EDMI_ClientSuite/MyApplication.vb

@@ -1,5 +1,6 @@
 Imports System.ServiceModel
 Imports System.Threading
+Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 Imports EDMI_ClientSuite.NetworkService_DDEDM
 
@@ -10,6 +11,7 @@ Namespace My
     ''' </summary>
     <HideModuleName()>
     Module Extension
+        Property ConfigManager As ConfigManager(Of ClassConfig)
         Property LogConfig As LogConfig
         Property ChannelFactory As ChannelFactory(Of IEDMServiceChannel)
         Property Channel As IEDMServiceChannel

EDMI_ClientSuite/frmConfigService.vb

@@ -20,7 +20,9 @@ Public Class frmConfigService
 
         If oResult = ConnectionTestResult.Successful Then
             ' Save Endpoint URL
-            My.Settings.ICMServiceAddress = oEndpointURL
+            My.ConfigManager.Config.ServiceConnection = oEndpointURL
+            My.ConfigManager.Save()
+            'My.Settings.ICMServiceAddress = oEndpointURL
             lblStatus.Text = "Verbindung hergestellt."
         Else
             Select Case oResult

EDMI_ClientSuite/frmSplash.vb

@@ -26,7 +26,7 @@ Public NotInheritable Class frmSplash
         BringToFront()
 
         Dim oInit As New ClassInit()
-        Dim oConnectionURLExists = oInit.TestConnectionURLExists
+        Dim oConnectionURLExists = oInit.TestConnectionURLExists()
 
         If Not oConnectionURLExists Then
             Dim oResult = frmConfigService.ShowDialog()

Filesystem/File.vb

@@ -95,6 +95,10 @@ Public Class File
     End Sub
 
     Public Function TestPathIsDirectory(Path As String) As Boolean
+        If Not Directory.Exists(Path) Then
+            Return False
+        End If
+
         Dim oIsDirectory As Boolean = (System.IO.File.GetAttributes(Path) And FileAttributes.Directory) = FileAttributes.Directory
         Return oIsDirectory
     End Function