Prefer local configuration if present over the configuration in the a…

…ppdata
Soloplan · Oct 6, 2020 · d623f0f · d623f0f
1 parent 75c5c8d
commit d623f0f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/src/Soloplan.WhatsON.GUI/Configuration/AboutPage.xaml.cs b/src/Soloplan.WhatsON.GUI/Configuration/AboutPage.xaml.cs
@@ -174,7 +174,7 @@ private void ExportButtonClick(object sender, RoutedEventArgs e)
 
     private string GetConfigFileFilter()
     {
-      return $"{Properties.Resources.JsonFilesFilterName}|*.{SerializationHelper.Instance.ConfigFileExtension}";
+      return $"{Properties.Resources.JsonFilesFilterName}|*.{SerializationHelper.ConfigFileExtension}";
     }
   }
 }
diff --git a/src/Soloplan.WhatsON.GUI/Configuration/ProjectsDataInterchange.cs b/src/Soloplan.WhatsON.GUI/Configuration/ProjectsDataInterchange.cs
@@ -85,7 +85,7 @@ public bool Import(ApplicationConfiguration appConfiguration)
 
     private string GetProjectsInterchangeFileFilter()
     {
-      return $"{Properties.Resources.JsonFilesFilterName}|*.{SerializationHelper.Instance.ConfigFileExtension}";
+      return $"{Properties.Resources.JsonFilesFilterName}|*.{SerializationHelper.ConfigFileExtension}";
     }
 
     /// <summary>

diff --git a/src/Soloplan.WhatsON/SerializationHelper.cs b/src/Soloplan.WhatsON/SerializationHelper.cs
@@ -9,10 +9,10 @@ namespace Soloplan.WhatsON
 {
   using System;
   using System.Collections.Generic;
-  using System.Diagnostics;
   using System.IO;
   using System.Linq;
   using System.Net;
+  using System.Reflection;
   using System.Threading;
   using System.Threading.Tasks;
   using Newtonsoft.Json;
@@ -26,36 +26,44 @@ namespace Soloplan.WhatsON
   public sealed class SerializationHelper
   {
     /// <summary>
-    /// The  <see cref="Lazy{T}"/> instance for the singleton.
+    /// The configuration file extension.
     /// </summary>
-    static readonly Lazy<SerializationHelper> lazy = new Lazy<SerializationHelper>(() => new SerializationHelper());
+    public const string ConfigFileExtension = "json";
 
     /// <summary>
-    /// The instance of the <see cref="SerializationHelper"/>.
+    /// Logger instance used by this class.
     /// </summary>
-    public static SerializationHelper Instance => lazy.Value;
+    private static readonly Logger log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType?.ToString());
 
     /// <summary>
-    /// The configuration file extension.
+    /// The  <see cref="Lazy{T}"/> instance for the singleton.
     /// </summary>
-    public readonly string ConfigFileExtension = "json";
+    private static readonly Lazy<SerializationHelper> lazy = new Lazy<SerializationHelper>(() => new SerializationHelper());
 
     /// <summary>
-    /// The configuration folder path, without the back slash.
+    /// Initializes a new instance of the <see cref="SerializationHelper"/> class.
     /// </summary>
-    public string ConfigFolder;
-
-    public string ConfigFile => this.ConfigFolder + "\\configuration." + this.ConfigFileExtension;
-
     public SerializationHelper()
     {
-      this.ConfigFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\WhatsOn";
+      var localFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+      var localConfigFolder = localFolder != null ? Path.Combine(localFolder, "config") : null;
+      var appDataConfigFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\WhatsOn";
+
+      // prefer local configuration if present over the configuration in the appdata
+      this.ConfigFolder = localConfigFolder != null && Directory.Exists(localConfigFolder) ? localConfigFolder : appDataConfigFolder;
     }
 
     /// <summary>
-    /// Logger instance used by this class.
+    /// Gets the instance of the <see cref="SerializationHelper"/>.
     /// </summary>
-    private static readonly Logger log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType?.ToString());
+    public static SerializationHelper Instance => lazy.Value;
+
+    /// <summary>
+    /// Gets the configuration folder path, without the back slash.
+    /// </summary>
+    public string ConfigFolder { get; private set; }
+
+    public string ConfigFile => this.ConfigFolder + "\\configuration." + ConfigFileExtension;
 
     /// <summary>
     /// Saves the configuration to specified file.
@@ -86,8 +94,8 @@ public static T Load<T>(string file)
 
     public ApplicationConfiguration LoadConfiguration()
     {
-      log.Debug("Loading configuration form file {file}", ConfigFile);
-      var result = Load<ApplicationConfiguration>(ConfigFile);
+      log.Debug("Loading configuration form file {file}", this.ConfigFile);
+      var result = Load<ApplicationConfiguration>(this.ConfigFile);
       this.HandleConfigurationErrors(result);
       return result;
     }