Merge pull request #50 from EverseDevelopment/develop

Hotfix Settings

Author: vnoves

e-verse.Navisworks.SelectByRevitId.Plugin/App.config

@@ -23,7 +23,7 @@ public static async Task Send(string action, string details)
             string user = Environment.UserName;
             ApplicationVersion versionNavis = Application.Version;
             string software = string.Concat("Navisworks ", versionNavis.ApiMajor);
-            string version = SettingsConfig.GetValue("version");
+            string version = SettingsConfig.currentVersion;
 
             // Use string interpolation to incorporate variables into the JSON string
             string json = $@"{{

e-verse.Navisworks.SelectByRevitId.Plugin/Utils/Analytics.cs

@@ -1,28 +1,127 @@
-using System.Configuration;
+using System.Collections.Generic;
+using System;
+using System.Configuration;
 using System.IO;
 using System.Reflection;
+using System.Xml;
 using Configuration = System.Configuration.Configuration;
+using System.Windows.Input;
 
 namespace EVerse.Navisworks.SelectByRevitId.Plugin
 {
     public static class SettingsConfig
     {
-        private static readonly string BinaryLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-        private static string appSettingsName = string.Concat(Assembly.GetExecutingAssembly().GetName().Name, ".dll.config");
-        private static string appSettingsFile = System.IO.Path.Combine(BinaryLocation, appSettingsName);
+        public static readonly string currentVersion = "1.0.20";
+        public static readonly string currentApiKey = "PlaceHolderApiKey";
+
+        private static readonly string _configDir =
+            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Pris");
+
+        private static readonly string _configFile =
+            Path.Combine(_configDir, "pris.config");
+
+        private static readonly object _locker = new object();
+
+        static SettingsConfig()
+        {
+            // Ensure folder exists
+            if (!Directory.Exists(_configDir))
+                Directory.CreateDirectory(_configDir);
+
+            // Ensure file exists with defaults
+            if (!File.Exists(_configFile))
+                CreateDefaultConfig();
+        }
 
         public static string GetValue(string key)
         {
-            Configuration configuration = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap { ExeConfigFilename = appSettingsFile }, ConfigurationUserLevel.None);
-            return configuration.AppSettings.Settings[key].Value;
+            if (!File.Exists(_configFile))
+                CreateDefaultConfig();
+
+            lock (_locker)
+            {
+                try
+                {
+                    Configuration config = OpenConfig();
+                    KeyValueConfigurationElement setting = config.AppSettings.Settings[key];
+                    return setting != null ? setting.Value : null;
+                }
+                catch (Exception ex)
+                {
+                    throw new InvalidOperationException(
+                        $"Error retrieving value for key '{key}'.", ex);
+                }
+            }
         }
 
         public static void SetValue(string key, string value)
         {
-            Configuration configuration = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap { ExeConfigFilename = appSettingsFile }, ConfigurationUserLevel.None);
-            configuration.AppSettings.Settings[key].Value = value;
-            configuration.Save(ConfigurationSaveMode.Modified, true);
-            ConfigurationManager.RefreshSection("appSettings");
+            if (!File.Exists(_configFile))
+                CreateDefaultConfig();
+
+            lock (_locker)
+            {
+                try
+                {
+                    Configuration config = OpenConfig();
+                    KeyValueConfigurationCollection settings = config.AppSettings.Settings;
+
+                    if (settings[key] == null)
+                        settings.Add(key, value);
+                    else
+                        settings[key].Value = value;
+
+                    config.Save(ConfigurationSaveMode.Modified);
+                    ConfigurationManager.RefreshSection("appSettings");
+                }
+                catch (Exception ex)
+                {
+                    throw new InvalidOperationException(
+                        $"Error setting value for key '{key}'.", ex);
+                }
+            }
+        }
+        private static Configuration OpenConfig()
+        {
+            var map = new ExeConfigurationFileMap { ExeConfigFilename = _configFile };
+            return ConfigurationManager.OpenMappedExeConfiguration(map, ConfigurationUserLevel.None);
+        }
+
+        /// <summary>
+        /// Creates leia.config with the requested default keys/values.
+        /// </summary>
+        private static void CreateDefaultConfig()
+        {
+            // Your requested defaults (removed the duplicated "runs" key to avoid errors).
+            var defaults = new Dictionary<string, string>
+            {
+                { "runs",   "0"  },
+                { "version",   "0.0.0"  },
+                { "user",   "user01"  },
+                { "release",   "0"  },
+                { "apikey",   "0"  }
+            };
+
+
+            var doc = new XmlDocument();
+            var decl = doc.CreateXmlDeclaration("1.0", "utf-8", null);
+            doc.AppendChild(decl);
+
+            XmlElement configuration = doc.CreateElement("configuration");
+            doc.AppendChild(configuration);
+
+            XmlElement appSettings = doc.CreateElement("appSettings");
+            configuration.AppendChild(appSettings);
+
+            foreach (var kvp in defaults)
+            {
+                XmlElement add = doc.CreateElement("add");
+                add.SetAttribute("key", kvp.Key);
+                add.SetAttribute("value", kvp.Value);
+                appSettings.AppendChild(add);
+            }
+
+            doc.Save(_configFile);
         }
     }
-}
+}

e-verse.Navisworks.SelectByRevitId.Plugin/Utils/SettingsConfig.cs

@@ -4,7 +4,7 @@ public class LabelVersion
     {
         public static void Update(MainWindowViewModel mainWindowViewModel)
         {
-            string version = SettingsConfig.GetValue("version");
+            string version = SettingsConfig.currentVersion;
 
             mainWindowViewModel.Version = version;
         }

e-verse.Navisworks.SelectByRevitId.Plugin/Windows/LabelVersion.cs

@@ -43,7 +43,4 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)App.config" />
-  </ItemGroup>
 </Project>