[Feature] USB - Portable user.config and relative folder (#158), vers…

…ion 1.0.17.37
Hofknecht · May 9, 2021 · b7038b5 · b7038b5
1 parent 94bc94b
commit b7038b5
Show file tree

Hide file tree

Showing 7 changed files with 329 additions and 87 deletions.
diff --git a/Config/Config.cs b/Config/Config.cs
@@ -5,6 +5,7 @@
 namespace SystemTrayMenu
 {
     using System;
+    using System.Configuration;
     using System.Diagnostics;
     using System.Drawing;
     using System.IO;
@@ -174,35 +175,14 @@ private static bool IsRegistryValueThisValue(string keyName, string valueName, s
 
         private static void UpgradeIfNotUpgraded()
         {
+            var path = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoaming).FilePath;
+            path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             if (!Settings.Default.IsUpgraded)
             {
                 Settings.Default.Upgrade();
                 Settings.Default.IsUpgraded = true;
                 Settings.Default.Save();
-
-                FileVersionInfo versionInfo = FileVersionInfo.
-                    GetVersionInfo(Assembly.GetEntryAssembly().Location);
-                string upgradedFromPath = $"%localappdata%\\{versionInfo.CompanyName}\\";
-                try
-                {
-                    upgradedFromPath = System.IO.Path.GetFullPath(upgradedFromPath);
-                }
-                catch (Exception ex)
-                {
-                    if (ex is ArgumentException ||
-                        ex is System.Security.SecurityException ||
-                        ex is NotSupportedException ||
-                        ex is PathTooLongException)
-                    {
-                        Log.Warn($"Resolve path {upgradedFromPath} failed", ex);
-                    }
-                    else
-                    {
-                        throw;
-                    }
-                }
-
-                Log.Info($"Settings upgraded from {upgradedFromPath}");
+                Log.Info($"Settings upgraded from {CustomSettingsProvider.UserConfigPath}");
             }
         }
 

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.17.36")]
-[assembly: AssemblyFileVersion("1.0.17.36")]
+[assembly: AssemblyVersion("1.0.17.37")]
+[assembly: AssemblyFileVersion("1.0.17.37")]
diff --git a/Properties/CustomSettingsProvider.cs b/Properties/CustomSettingsProvider.cs
@@ -10,7 +10,9 @@ namespace SystemTrayMenu.Properties
     using System.Globalization;
     using System.IO;
     using System.Linq;
+    using System.Reflection;
     using System.Xml.Linq;
+    using SystemTrayMenu.Utilities;
 
     internal class CustomSettingsProvider : SettingsProvider
     {
@@ -48,17 +50,39 @@ public override string ApplicationName
         /// Gets the setting key this is returning must set before the settings are used.
         /// e.g. <c>Properties.Settings.Default.SettingsKey = @"C:\temp\user.config";</c>.
         /// </summary>
-        private static string UserConfigPath => Path.Combine(
+        public static string UserConfigPath => Path.Combine(
                 Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
                 $"SystemTrayMenu"),
                 $"user-{Environment.MachineName}.config");
 
+        private static string ConfigPathAssembly => Path.Combine(
+                Directory.GetParent(Assembly.GetEntryAssembly().Location).FullName,
+                $"user.config");
+
         /// <summary>
         /// Gets or sets in memory storage of the settings values.
         /// </summary>
         private Dictionary<string, SettingStruct> SettingsDictionary { get; set; }
 
+        public static bool IsActivatedConfigPathAssembly()
+        {
+            return IsConfigPathAssembly();
+        }
+
+        public static void ActivateConfigPathAssembly()
+        {
+            CreateEmptyConfigIfNotExists(ConfigPathAssembly);
+        }
+
+        public static void DeactivateConfigPathAssembly()
+        {
+            if (IsConfigPathAssembly())
+            {
+                File.Delete(ConfigPathAssembly);
+            }
+        }
+
         /// <summary>
         /// Override.
         /// </summary>
@@ -151,33 +175,63 @@ public override void SetPropertyValues(SettingsContext context, SettingsProperty
         /// Creates an empty user.config file...looks like the one MS creates.
         /// This could be overkill a simple key/value pairing would probably do.
         /// </summary>
-        private static void CreateEmptyConfig()
+        private static void CreateEmptyConfigIfNotExists(string path)
         {
-            XDocument doc = new XDocument();
-            XDeclaration declaration = new XDeclaration("1.0", "utf-8", "true");
-            XElement config = new XElement(Config);
-            XElement userSettings = new XElement(UserSettings);
-            XElement group = new XElement(typeof(Properties.Settings).FullName);
-            userSettings.Add(group);
-            config.Add(userSettings);
-            doc.Add(config);
-            doc.Declaration = declaration;
-            doc.Save(UserConfigPath);
+            if (!File.Exists(path))
+            {
+                // if the config file is not where it's supposed to be create a new one.
+                XDocument doc = new XDocument();
+                XDeclaration declaration = new XDeclaration("1.0", "utf-8", "true");
+                XElement config = new XElement(Config);
+                XElement userSettings = new XElement(UserSettings);
+                XElement group = new XElement(typeof(Properties.Settings).FullName);
+                userSettings.Add(group);
+                config.Add(userSettings);
+                doc.Add(config);
+                doc.Declaration = declaration;
+                try
+                {
+                    doc.Save(path);
+                }
+                catch (Exception ex)
+                {
+                    Log.Warn($"Failed to store config at assembly location {path}", ex);
+                }
+            }
+        }
+
+        private static bool IsConfigPathAssembly()
+        {
+            bool isconfigPathAssembly = false;
+            try
+            {
+                isconfigPathAssembly = File.Exists(ConfigPathAssembly);
+            }
+            catch (Exception ex)
+            {
+                Log.Warn("IsConfigPathAssembly failed", ex);
+            }
+
+            return isconfigPathAssembly;
         }
 
         /// <summary>
         /// Loads the values of the file into memory.
         /// </summary>
         private void LoadValuesFromFile()
         {
-            if (!File.Exists(UserConfigPath))
-            {
-                // if the config file is not where it's supposed to be create a new one.
-                CreateEmptyConfig();
-            }
+            CreateEmptyConfigIfNotExists(UserConfigPath);
 
             // load the xml
-            XDocument configXml = XDocument.Load(UserConfigPath);
+            XDocument configXml;
+            if (IsConfigPathAssembly())
+            {
+                configXml = XDocument.Load(ConfigPathAssembly);
+            }
+            else
+            {
+                configXml = XDocument.Load(UserConfigPath);
+            }
 
             // get all of the <setting name="..." serializeAs="..."> elements.
             IEnumerable<XElement> settingElements = configXml.Element(Config).Element(UserSettings).Element(typeof(Properties.Settings).FullName).Elements(Setting);
@@ -202,7 +256,15 @@ private void LoadValuesFromFile()
         private void SaveValuesToFile()
         {
             // load the current xml from the file.
-            XDocument import = XDocument.Load(UserConfigPath);
+            XDocument import;
+            if (IsConfigPathAssembly())
+            {
+                import = XDocument.Load(ConfigPathAssembly);
+            }
+            else
+            {
+                import = XDocument.Load(UserConfigPath);
+            }
 
             // get the settings group (e.g. <Company.Project.Desktop.Settings>)
             XElement settingsSection = import.Element(Config).Element(UserSettings).Element(typeof(Properties.Settings).FullName);
@@ -227,6 +289,11 @@ private void SaveValuesToFile()
                 }
             }
 
+            if (IsConfigPathAssembly())
+            {
+                import.Save(ConfigPathAssembly);
+            }
+
             import.Save(UserConfigPath);
         }
 

diff --git a/Resources/lang.Designer.cs b/Resources/lang.Designer.cs
diff --git a/Resources/lang.resx b/Resources/lang.resx
@@ -279,4 +279,16 @@
   <data name="To change a color paste a HTML Color Code or double click into a field." xml:space="preserve">
     <value>To change a color paste a HTML Color Code or double click into a field.</value>
   </data>
+  <data name="Change to relative folder" xml:space="preserve">
+    <value>Change to relative folder</value>
+  </data>
+  <data name="Store config at assembly location" xml:space="preserve">
+    <value>Store config at assembly location</value>
+  </data>
+  <data name="USB" xml:space="preserve">
+    <value>USB</value>
+  </data>
+  <data name="Open assembly location" xml:space="preserve">
+    <value>Open assembly location</value>
+  </data>
 </root>