Improvements in logging and keepalive feature

nefares · Dec 18, 2023 · 892da69 · 892da69
1 parent eeebf07
commit 892da69
Show file tree

Hide file tree

Showing 5 changed files with 541 additions and 413 deletions.
diff --git a/WinBGMute/ForegroundProcessManager.cs b/WinBGMute/ForegroundProcessManager.cs
@@ -90,7 +90,7 @@ UInt32 dwmsEventTime
 
                 if (!m_JobStack.IsEmpty)
                 {
-                    //LoggingEngine.LogLine("[!] discrading previous foreground processes ");
+                    LoggingEngine.LogLine("[*] discrading previous foreground processes ");
                 }
                 m_JobStack.Clear();
 
@@ -109,11 +109,13 @@ UInt32 dwmsEventTime
              TODO: in the future, remove the whole WinEventProc (and the related stack) and replace them with the following piece of code which does the same job more reliably */
             int poll_fpid = PollForegroundProcessId();
 
+            /* there was a change in the foreground process */
             if (m_lastForegroundId != poll_fpid)
             {
                 success = true;
                 m_lastForegroundId = poll_fpid;
             }
+            /* no change */
             else
             {
                 success = false;

diff --git a/WinBGMute/LoggingEngine.cs b/WinBGMute/LoggingEngine.cs
@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace WinBGMuter
@@ -33,6 +34,8 @@ public enum LOG_LEVEL_TYPE {LOG_NONE, LOG_ERROR, LOG_WARNING, LOG_INFO, LOG_DEBU
 
         public static LOG_LEVEL_TYPE LogLevel { get; set; }
 
+        public static bool HasDateTime {  get; set; }    
+
         [DllImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         static extern bool AllocConsole();
@@ -80,6 +83,15 @@ public static void SetEngine(_LogFunction logfn, _LogLineFunction loglinefn)
             m_logLineFunction = loglinefn;
         }
 
+        private static string FormatInput(object input, LOG_LEVEL_TYPE loglevel = LOG_LEVEL_TYPE.LOG_DEBUG)
+        {
+            string output = "";
+            output += HasDateTime ? DateTime.Now.ToString("dd/MM/yyyy H:mm:ss:fff") : "";
+            output += " > ";
+            output += input;
+
+            return output;
+        }
         public static void Log(object input, object? color = null, object? font = null, LOG_LEVEL_TYPE loglevel = LOG_LEVEL_TYPE.LOG_DEBUG)
         {
             if (!Enabled)
@@ -90,6 +102,8 @@ public static void Log(object input, object? color = null, object? font = null,
             {
                 return;
             }
+
+
             m_logFunction(input, color, font);
         }
 
@@ -102,7 +116,8 @@ public static void LogLine(object input, object? color = null, object? font = nu
             {
                 return;
             }
-            m_logLineFunction(input, color, font);
+
+            m_logLineFunction(FormatInput(input), color, font);
         }
 
     }