Fixes a bug in the ConfigFile class

The basic `ConfigFile.Deserialize` method was incorrectly putting a `FileInfo` into the `GenericConfig` field
QutEcoacoustics · Feb 17, 2018 · cc45832 · cc45832
1 parent 620b644
commit cc45832
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/src/Acoustics.Shared/ConfigFile/Config.cs b/src/Acoustics.Shared/ConfigFile/Config.cs
@@ -38,14 +38,15 @@ public Config()
 
         internal Config(TextReader streamReader, string configPath)
         {
-            this.GenericConfig = Yaml.Deserialize<object>(streamReader);
-            this.ConfigPath = configPath;
+            this.Initialize(streamReader, configPath);
         }
 
-        internal Config(object document, string configPath)
+        internal Config(string configPath)
         {
-            this.GenericConfig = document;
-            this.ConfigPath = configPath;
+            using (var fileStream = File.OpenText(configPath))
+            {
+                this.Initialize(fileStream, configPath);
+            }
         }
 
         private delegate bool Convert<T>(string value, out T convertedValue);
@@ -144,6 +145,12 @@ private static Convert<T> GetEnumConverter<T>()
             return (string value, out T convertedValue) => Enum.TryParse(value, true, out convertedValue);
         }
 
+        private void Initialize(TextReader streamReader, string configPath)
+        {
+            this.GenericConfig = Yaml.Deserialize<object>(streamReader);
+            this.ConfigPath = configPath;
+        }
+
         // Recursive!
         private void VisitAll(object node, Dictionary<string, string> result, string prefix)
         {

diff --git a/src/Acoustics.Shared/ConfigFile/ConfigFile.Profiles.cs b/src/Acoustics.Shared/ConfigFile/ConfigFile.Profiles.cs
@@ -46,7 +46,7 @@ public static bool TryGetProfile<TConfig>(TConfig configuration, string profileN
                 return false;
             }
 
-            profile = new Config(mapping, configuration.ConfigPath);
+            profile = new Config() { GenericConfig = mapping, ConfigPath = configuration.ConfigPath };
             return true;
         }
 

diff --git a/src/Acoustics.Shared/ConfigFile/ConfigFile.cs b/src/Acoustics.Shared/ConfigFile/ConfigFile.cs
@@ -11,19 +11,14 @@ namespace Acoustics.Shared.ConfigFile
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.IO;
     using System.Linq;
-    using System.Reflection;
     using System.Runtime.CompilerServices;
 
     using Contracts;
-    using Fasterflect;
 
     using log4net;
 
-    using YamlDotNet.RepresentationModel;
-
     using Zio;
 
     public static partial class ConfigFile
@@ -53,18 +48,31 @@ public static string ConfigFolder
 
         public static Config Deserialize(FileInfo file)
         {
-            var config = new Config(file, file.FullName);
+            return Deserialize(file.FullName);
+        }
+
+        public static Config Deserialize(string path)
+        {
+            var config = new Config(path);
             config.InvokeLoaded();
             return config;
         }
 
         public static T Deserialize<T>(FileInfo file)
             where T : Config
         {
-            (object generic, T config) = Yaml.LoadAndDeserialize<T>(file);
+            return Deserialize<T>(file.FullName);
+        }
+
+        public static T Deserialize<T>(string path)
+            where T : Config
+        {
+            path = Path.GetFullPath(path);
+
+            (object generic, T config) = Yaml.LoadAndDeserialize<T>(path);
 
             config.GenericConfig = generic;
-            config.ConfigPath = file.FullName;
+            config.ConfigPath = path;
             config.InvokeLoaded();
 
             return config;