2.2.0.8 - New macro tags for getting the name of the currently logged in user and the name of the machine being used

Author: igloo-gkendall

FormMain.Designer.cs

@@ -32,6 +32,6 @@
 // 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("2.2.0.7")]
-[assembly: AssemblyFileVersion("2.2.0.7")]
+[assembly: AssemblyVersion("2.2.0.8")]
+[assembly: AssemblyFileVersion("2.2.0.8")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]

Properties/AssemblyInfo.cs

@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.2.0.7"/>
+    version="2.2.0.8"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

app.manifest

@@ -7,6 +7,8 @@
 //-----------------------------------------------------------------------
 namespace AutoScreenCapture
 {
+    using System;
+
     /// <summary>
     /// 
     /// </summary>
@@ -93,6 +95,8 @@ public static string ParseTags(string name, string macro, ImageFormat format)
             macro = macro.Replace(MacroTagSpec.Second, screenCapture.DateTimePreviousCycle.ToString(SecondFormat));
             macro = macro.Replace(MacroTagSpec.Millisecond, screenCapture.DateTimePreviousCycle.ToString(MillisecondFormat));
             macro = macro.Replace(MacroTagSpec.Count, screenCapture.Count.ToString());
+            macro = macro.Replace(MacroTagSpec.User, Environment.UserName);
+            macro = macro.Replace(MacroTagSpec.Machine, Environment.MachineName);
 
             return macro;
         }

macro/MacroParser.cs

@@ -38,6 +38,8 @@ public MacroTagCollection()
             Add(new MacroTag(MacroTagSpec.Second, "Second of " + DateTime.Now.ToString(MacroParser.TimeFormat) + " (" + DateTime.Now.ToString(MacroParser.SecondFormat) + ")"));
             Add(new MacroTag(MacroTagSpec.Millisecond, "Millisecond of " + DateTime.Now.ToString(MacroParser.TimeFormat) + " (" + DateTime.Now.ToString(MacroParser.MillisecondFormat) + ")"));
             Add(new MacroTag(MacroTagSpec.Count, "Number of screen capture cycles during the current screen capture session"));
+            Add(new MacroTag(MacroTagSpec.User, "Name of logged in user (" + Environment.UserName + ")"));
+            Add(new MacroTag(MacroTagSpec.Machine, "Name of machine being used (" + Environment.MachineName + ")"));
         }
 
         /// <summary>

macro/MacroTagCollection.cs

@@ -21,5 +21,7 @@ public static class MacroTagSpec
         public static readonly string Second = "%second%";
         public static readonly string Millisecond = "%millisecond%";
         public static readonly string Count = "%count%";
+        public static readonly string User = "%user%";
+        public static readonly string Machine = "%machine%";
     }
 }

macro/MacroTagSpec.cs

@@ -13,7 +13,7 @@ namespace AutoScreenCapture
     public static class Settings
     {
         public static readonly string ApplicationName = "Auto Screen Capture";
-        public static readonly string ApplicationVersion = "2.2.0.7";
+        public static readonly string ApplicationVersion = "2.2.0.8";
         public static readonly string ApplicationCodename = "Dalek";
 
         public static SettingCollection Application;
@@ -29,15 +29,9 @@ public static void Initialize()
             // This version.
             _versionCollection.Add(new Version(ApplicationCodename, ApplicationVersion, isCurrentVersion: true));
 
-            // Older versions should be listed here.
+            // Older versions should be listed here only if you need to check for a specific version
+            // in order to upgrade a particular area of the application.
             _versionCollection.Add(new Version("Clara", "2.1.8.2"));
-            _versionCollection.Add(new Version("Dalek", "2.2.0.0"));
-            _versionCollection.Add(new Version("Dalek", "2.2.0.1"));
-            _versionCollection.Add(new Version("Dalek", "2.2.0.2"));
-            _versionCollection.Add(new Version("Dalek", "2.2.0.3"));
-            _versionCollection.Add(new Version("Dalek", "2.2.0.4"));
-            _versionCollection.Add(new Version("Dalek", "2.2.0.5"));
-            _versionCollection.Add(new Version("Dalek", "2.2.0.6"));
 
             Application = new SettingCollection();
             Application.Filepath = FileSystem.SettingsFolder + FileSystem.ApplicationSettingsFile;
@@ -58,6 +52,11 @@ public static void Initialize()
                 if (File.Exists(Application.Filepath))
                 {
                     Application.Load();
+
+                    Application.GetByKey("Name", defaultValue: Settings.ApplicationName).Value = ApplicationName;
+                    Application.GetByKey("Version", defaultValue: Settings.ApplicationVersion).Value = ApplicationVersion;
+
+                    Application.Save();
                 }
                 else
                 {