Updated depedencies. Better logging. Attempt to fix Issue #24.

- Commands file not saved at exit anymore
- Only watching changes
- Display log threshold settings dialog now works correctly

Installer/version.txt

@@ -1 +1 @@
-2.2.8.10
+2.2.8.62

src/AssemblyFileVersion.tt

@@ -10,6 +10,8 @@
 	if (n > -1)
 		dir = dir.Remove(n, dir.Length - n) + "..\\..\\";
 	string file = Path.Combine(dir, "..\\Installer\\version.txt");
+    Console.WriteLine("Generating " + file + " ...");
+
 	string contents = File.ReadAllText(file); 
 
 	string[] parts = contents.Split('.');
@@ -22,11 +24,11 @@
 	string version = string.Join(".", parts);
 	// write the new version number back to the file
 	File.WriteAllText(file, version);
-	Console.WriteLine("Generated Build #: " + version);
+	Console.WriteLine("Wrote " + version + " to " + file);
 #>
 // This file was generated by a tool. Any changes made manually will be lost
 // the next time this project is built (via AssemblyFileVersion.tt).
 using System.Reflection;
 [assembly: AssemblyVersion("<#= version #>")]
 [assembly: AssemblyFileVersion("<#= version #>")]
-[assembly: AssemblyCopyright("Copyright © 2021 Kindel Systems, LLC.")] 
+[assembly: AssemblyCopyright("Copyright © 2022 Kindel Systems, LLC.")] 

src/Commands/CommandInvoker.cs

@@ -70,12 +70,17 @@ public static CommandInvoker Create(string userCommandsFile, string currentVersi
             serializedCmds = SerializedCommands.LoadCommands(userCommandsFile, currentVersion);
             if (serializedCmds != null && serializedCmds.commandArray != null) {
                 foreach (var cmd in serializedCmds.commandArray) {
-                    // TELEMETRY: Mark user defined commands as such so they don't get collected
-                    if (!commands.ContainsKey(cmd.Cmd)) {
-                        cmd.UserDefined = true;
-                    }
+                    if (!string.IsNullOrWhiteSpace(cmd.Cmd)) {
+                        // TELEMETRY: Mark user defined commands as such so they don't get collected
+                        if (!commands.ContainsKey(cmd.Cmd)) {
+                            cmd.UserDefined = true;
+                        }
 
-                    commands.Add(cmd);
+                        commands.Add(cmd);
+                    }
+                    else {
+                        Logger.Instance.Log4.Error($"{commands.GetType().Name}: Cmd name can't be blank or whitespace ({cmd})");
+                    }
                 }
                 Logger.Instance.Log4.Info($"{commands.GetType().Name}: {serializedCmds.Count} commands loaded");
             }
@@ -115,7 +120,7 @@ private void Add(Command cmd, bool log = false) {
                 }
             }
             else {
-                Logger.Instance.Log4.Info($"{this.GetType().Name}: Error parsing command: {cmd.ToString()}");
+                Logger.Instance.Log4.Error($"{this.GetType().Name}: Error parsing command: {cmd}");
             }
         }
 

src/Commands/McecCommand.cs

@@ -81,7 +81,7 @@ public override bool Execute() {
                         }
                     }
                     catch (Exception e) {
-                        Logger.Instance.Log4.Info($"{this.GetType().Name}: ({Cmd}:{Args}) <{match.Groups[1].Value} {cmd.ToString()}/> - {e.Message}");
+                        Logger.Instance.Log4.Error($"{this.GetType().Name}: ({Cmd}:{Args}) <{match.Groups[1].Value} {cmd.ToString()}/> - {e.Message}");
                         return false;
                     }
                     break;

src/Commands/SendInputCommand.cs

@@ -262,7 +262,7 @@ public override bool Execute() {
                 }
             }
             catch (Exception e) {
-                Logger.Instance.Log4.Info($"{this.GetType().Name}: failed. {e.Message}");
+                Logger.Instance.Log4.Error($"{this.GetType().Name}: failed. {e.Message}");
                 return false;
             }
             return true;

src/Commands/SendMessageCommand.cs

@@ -88,7 +88,7 @@ public override bool Execute() {
                 }
             }
             catch (Exception e) {
-                Logger.Instance.Log4.Info($"{this.GetType().Name}: Failed for {ClassName} with error: {e.Message}");
+                Logger.Instance.Log4.Error($"{this.GetType().Name}: Failed for {ClassName} with error: {e.Message}");
                 return true;
             }
             return false;

src/Commands/SerializedCommands.cs

@@ -68,32 +68,38 @@ static public SerializedCommands LoadCommands(string userCommandsFile, string cu
             SerializedCommands cmds = null;
             FileStream fs = null;
             try {
-                Logger.Instance.Log4.Info($"CommandInvoker: Loading user-defined commands from {userCommandsFile}");
+                Logger.Instance.Log4.Info($"SerializedCommands: Loading user-defined commands from {userCommandsFile}");
                 fs = new FileStream(userCommandsFile, FileMode.Open, FileAccess.Read);
                 cmds = Deserialize(fs);
 
-                // Is this a legacy load? If so, enable all commands and warn user
-                if (string.IsNullOrEmpty(cmds.Version)) {
-                    var msg = $"{userCommandsFile} was created with a legacy version of MCE Controller.\n\nConverting it and enabling all commands it contains.\n\nDisable any commands that are not used using the Commands window.";
-                    MessageBox.Show(msg, Application.ProductName);
-                    Logger.Instance.Log4.Info($"CommandInvoker: {msg}");
-                    cmds.Version = currentVersion;
-                    cmds.commandArray = cmds.commandArray.Select(c => { c.Enabled = true; return c; }).ToArray();
+                if (cmds == null) {
+                    // Deserialization failed. We could automatically rewrite the file, but that would be rude.
+                    // Deserialize logged this
                 }
-
-                // If this was written by an older version, re-write it to update it
-                if (!string.IsNullOrEmpty(cmds.Version) && (new Version(currentVersion).CompareTo(new Version(cmds.Version))) > 0) {
-                    Logger.Instance.Log4.Info($"CommandInvoker: Upgrading .commands file from v{cmds.Version}");
-                    SaveCommands(userCommandsFile, cmds, currentVersion);
+                else {
+                    // Is this a legacy load? If so, enable all commands and warn user
+                    if (string.IsNullOrEmpty(cmds.Version)) {
+                        var msg = $"{userCommandsFile} was created with a legacy version of MCE Controller.\n\nConverting it and enabling all commands it contains.\n\nDisable any commands that are not used using the Commands window.";
+                        MessageBox.Show(msg, Application.ProductName);
+                        Logger.Instance.Log4.Info($"SerializedCommands: {msg}");
+                        cmds.Version = currentVersion;
+                        cmds.commandArray = cmds.commandArray.Select(c => { c.Enabled = true; return c; }).ToArray();
+                    }
+
+                    // If this was written by an older version, re-write it to update it
+                    if (!string.IsNullOrEmpty(cmds.Version) && (new Version(currentVersion).CompareTo(new Version(cmds.Version))) > 0) {
+                        Logger.Instance.Log4.Info($"SerializedCommands: Upgrading .commands file from v{cmds.Version}");
+                        SaveCommands(userCommandsFile, cmds, currentVersion);
+                    }
                 }
             }
             catch (FileNotFoundException) {
-                Logger.Instance.Log4.Info($"CommandInvoker: {userCommandsFile} was not found");
+                Logger.Instance.Log4.Error($"SerializedCommands: {userCommandsFile} was not found");
             }
             catch (Exception ex) {
                 var msg = $"No commands loaded. Error reading {userCommandsFile} - {ex.Message}.\n\nSee log file for details: {Logger.Instance.LogFile}\n\nFor help, open an issue at github.com/tig/mcec";
                 MessageBox.Show(msg, currentVersion);
-                Logger.Instance.Log4.Info($"CommandInvoker: {msg}");
+                Logger.Instance.Log4.Error($"SerializedCommands: {msg}");
                 Logger.DumpException(ex);
             }
             finally {
@@ -118,7 +124,7 @@ static public void SaveCommands(string userCommandsFile, SerializedCommands comm
             FileStream ucFS = null;
             try {
                 commands.Version = currentVersion;
-                ucFS = new FileStream(userCommandsFile, FileMode.Create, FileAccess.ReadWrite);
+                ucFS = new FileStream(userCommandsFile, FileMode.Create);
                 new XmlSerializer(typeof(SerializedCommands)).Serialize(ucFS, commands);
             }
             catch (Exception e) {
@@ -127,7 +133,7 @@ static public void SaveCommands(string userCommandsFile, SerializedCommands comm
                     $"See log file for details: {Logger.Instance.LogFile}\n\n" +
                     $"For help, open an issue at github.com/tig/mcec";
                 MessageBox.Show(msg, Application.ProductName);
-                Logger.Instance.Log4.Info($"CommandInvoker: {msg}");
+                Logger.Instance.Log4.Error($"SerializedCommands: {msg}");
                 Logger.DumpException(e);
             }
             finally {
@@ -166,11 +172,11 @@ private static SerializedCommands Deserialize(Stream xmlStream) {
                 cmds = (SerializedCommands)new XmlSerializer(typeof(SerializedCommands)).Deserialize(lcReader);
             }
             catch (InvalidOperationException ex) {
-                Logger.Instance.Log4.Info($"CommandInvoker: No commands loaded. Error parsing .commands XML. {ex.FullMessage()}");
+                Logger.Instance.Log4.Error($"SerializedCommands: No commands loaded. Error parsing .commands XML. {ex.FullMessage()}");
                 Logger.DumpException(ex);
             }
             catch (Exception ex) {
-                Logger.Instance.Log4.Info($"CommandInvoker: Error parsing .commands XML. {ex.Message}");
+                Logger.Instance.Log4.Error($"SerializedCommands: Error parsing .commands XML. {ex.Message}");
                 Logger.DumpException(ex);
             }
             finally {

src/Commands/SetForegroundWindowCmd.cs

@@ -68,7 +68,7 @@ public override bool Execute() {
                 }
             }
             catch (Exception e) {
-                Logger.Instance.Log4.Info($"{this.GetType().Name}: Failed for {ClassName} with error: {e.Message}");
+                Logger.Instance.Log4.Error($"{this.GetType().Name}: Failed for {ClassName} with error: {e.Message}");
                 return false;
             }
             return true;

src/Commands/ShutdownCommand.cs

@@ -94,7 +94,7 @@ public override bool Execute() {
                         break;
 
                     default:
-                        Logger.Instance.Log4.Info($"{this.GetType().Name}: ShutdownCommands: Invalid command: {ToString()}");
+                        Logger.Instance.Log4.Info($"{this.GetType().Name}: Invalid command: {ToString()}");
                         break;
                 }
             }
@@ -106,9 +106,11 @@ public override bool Execute() {
         }
 
         public static void Shutdown(string shutdownArgs) {
+            Logger.Instance.Log4.Debug($"ShutdownCommand: Invoking 'shutdown.exe {shutdownArgs}'");
             var proc = System.Diagnostics.Process.Start("shutdown", shutdownArgs);
             proc.WaitForExit(1000);
             if (proc.ExitCode != 0x0) {
+                Logger.Instance.Log4.Error($"ShutdownCommand: 'shutdown.exe {shutdownArgs}' failed ({proc.ExitCode:X}). Forcing Win32Exception...");
                 throw new System.ComponentModel.Win32Exception(proc.ExitCode);
             }
         }

src/Commands/StartProcessCommand.cs

@@ -124,7 +124,7 @@ public override bool Execute() {
                         p.WaitForInputIdle(1000); // TODO: Make this settable
                     }
                     catch (System.InvalidOperationException e) {
-                        Logger.Instance.Log4.Info($"{this.GetType().Name}: {e.Message}");
+                        Logger.Instance.Log4.Error($"{this.GetType().Name}: {e.Message}");
                         return false;
                     }
                 }

src/Dialogs/SettingsDialog.cs

@@ -268,9 +268,9 @@ private void InitializeComponent() {
             this._labelLogLevel.AutoSize = true;
             this._labelLogLevel.Location = new System.Drawing.Point(13, 35);
             this._labelLogLevel.Name = "_labelLogLevel";
-            this._labelLogLevel.Size = new System.Drawing.Size(78, 13);
+            this._labelLogLevel.Size = new System.Drawing.Size(277, 13);
             this._labelLogLevel.TabIndex = 1;
-            this._labelLogLevel.Text = "Log Threshold:";
+            this._labelLogLevel.Text = "Log Threshold (display only; log files always contain ALL):";
             // 
             // _checkBoxHideOnStartup
             // 
@@ -311,7 +311,7 @@ private void InitializeComponent() {
             this._checkBoxEnableClient.Location = new System.Drawing.Point(20, 10);
             this._checkBoxEnableClient.Margin = new System.Windows.Forms.Padding(1);
             this._checkBoxEnableClient.Name = "_checkBoxEnableClient";
-            this._checkBoxEnableClient.Size = new System.Drawing.Size(88, 17);
+            this._checkBoxEnableClient.Size = new System.Drawing.Size(95, 21);
             this._checkBoxEnableClient.TabIndex = 1;
             this._checkBoxEnableClient.Text = "Enable &Client";
             this._toolTipClient.SetToolTip(this._checkBoxEnableClient, "Starts a TCP/IP client connection to the specified address:port. Commands will be" +
@@ -408,7 +408,7 @@ private void InitializeComponent() {
             this._checkBoxEnableServer.Location = new System.Drawing.Point(20, 10);
             this._checkBoxEnableServer.Margin = new System.Windows.Forms.Padding(1);
             this._checkBoxEnableServer.Name = "_checkBoxEnableServer";
-            this._checkBoxEnableServer.Size = new System.Drawing.Size(93, 17);
+            this._checkBoxEnableServer.Size = new System.Drawing.Size(100, 21);
             this._checkBoxEnableServer.TabIndex = 0;
             this._checkBoxEnableServer.Text = "Enable &Server";
             this._toolTipServer.SetToolTip(this._checkBoxEnableServer, "Enables the TCP/IP server. It will listen on the specified port for commands.");
@@ -570,7 +570,7 @@ private void InitializeComponent() {
             this._checkBoxEnableSerialServer.Location = new System.Drawing.Point(20, 10);
             this._checkBoxEnableSerialServer.Margin = new System.Windows.Forms.Padding(1);
             this._checkBoxEnableSerialServer.Name = "_checkBoxEnableSerialServer";
-            this._checkBoxEnableSerialServer.Size = new System.Drawing.Size(122, 17);
+            this._checkBoxEnableSerialServer.Size = new System.Drawing.Size(129, 21);
             this._checkBoxEnableSerialServer.TabIndex = 1;
             this._checkBoxEnableSerialServer.Text = "Enable Serial Server";
             this._checkBoxEnableSerialServer.UseVisualStyleBackColor = true;
@@ -782,7 +782,7 @@ private void InitializeComponent() {
             this._checkBoxEnableActivityMonitor.Location = new System.Drawing.Point(20, 10);
             this._checkBoxEnableActivityMonitor.Margin = new System.Windows.Forms.Padding(1);
             this._checkBoxEnableActivityMonitor.Name = "_checkBoxEnableActivityMonitor";
-            this._checkBoxEnableActivityMonitor.Size = new System.Drawing.Size(159, 17);
+            this._checkBoxEnableActivityMonitor.Size = new System.Drawing.Size(166, 21);
             this._checkBoxEnableActivityMonitor.TabIndex = 0;
             this._checkBoxEnableActivityMonitor.Text = "Enable &User Activity Monitor";
             this._checkBoxEnableActivityMonitor.UseVisualStyleBackColor = true;
@@ -810,7 +810,7 @@ private void InitializeComponent() {
             this._presenceDetection.AutoSize = true;
             this._presenceDetection.Location = new System.Drawing.Point(17, 76);
             this._presenceDetection.Name = "_presenceDetection";
-            this._presenceDetection.Size = new System.Drawing.Size(368, 17);
+            this._presenceDetection.Size = new System.Drawing.Size(375, 21);
             this._presenceDetection.TabIndex = 3;
             this._presenceDetection.Text = "Don\'t send message if Power Broadcast API indicates user is not present";
             this._presenceDetection.UseVisualStyleBackColor = true;
@@ -821,7 +821,7 @@ private void InitializeComponent() {
             this._unlockDetection.AutoSize = true;
             this._unlockDetection.Location = new System.Drawing.Point(17, 53);
             this._unlockDetection.Name = "_unlockDetection";
-            this._unlockDetection.Size = new System.Drawing.Size(216, 17);
+            this._unlockDetection.Size = new System.Drawing.Size(223, 21);
             this._unlockDetection.TabIndex = 1;
             this._unlockDetection.Text = "Don\'t send message if desktop is locked";
             this._unlockDetection.UseVisualStyleBackColor = true;
@@ -832,7 +832,7 @@ private void InitializeComponent() {
             this._inputDetection.AutoSize = true;
             this._inputDetection.Location = new System.Drawing.Point(17, 30);
             this._inputDetection.Name = "_inputDetection";
-            this._inputDetection.Size = new System.Drawing.Size(289, 17);
+            this._inputDetection.Size = new System.Drawing.Size(296, 21);
             this._inputDetection.TabIndex = 0;
             this._inputDetection.Text = "Send message when keyboard/mouse input is detected";
             this._inputDetection.UseVisualStyleBackColor = true;
@@ -1012,9 +1012,6 @@ public SettingsDialog(AppSettings settings) {
             }
 
             _textBoxPacing.Text = $"{Settings.CommandPacing}";
-
-            //comboBoxLogThresholds.SelectedIndex = LogManager.GetLogger("MCEControl").Logger.Repository.LevelMap["ALL"].Value;
-
             _buttonOk.Enabled = false;
         }
 
@@ -1254,6 +1251,8 @@ private void SettingsDialog_Load(object sender, EventArgs e) {
 
         private void comboBoxLogThresholds_SelectedIndexChanged(object sender, EventArgs e) {
             Settings.TextBoxLogThreshold = _comboBoxLogThresholds.SelectedItem.ToString();
+            Logger.Instance.TextBoxThreshold = LogManager.GetLogger("MCEControl").Logger.Repository.LevelMap[Settings.TextBoxLogThreshold];
+
             SettingsChanged();
         }