[PTRun]Add logs to check Web Browser detection (#18831)

* [PTRun]Add logs to check Web Browser detection * Use proper initial value * Add punctuation to the end of the log message
microsoft · Jun 14, 2022 · 74ba26e · 74ba26e
1 parent d7c2fe3
commit 74ba26e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/modules/launcher/Wox.Infrastructure/Helper.cs b/src/modules/launcher/Wox.Infrastructure/Helper.cs
@@ -152,7 +152,7 @@ public static bool OpenCommandInShell(string path, string pattern, string argume
         {
             if (string.IsNullOrEmpty(pattern))
             {
-                Log.Warn("Trying to run OpenCommandInShell with an empty pattern. The default browser definition might have issues.", typeof(Helper));
+                Log.Warn($"Trying to run OpenCommandInShell with an empty pattern. The default browser definition might have issues. Path: '${path ?? string.Empty}' ; Arguments: '${arguments ?? string.Empty}' ; Working Directory: '${workingDir ?? string.Empty}'", typeof(Helper));
             }
             else if (pattern.Contains("%1", StringComparison.Ordinal))
             {

diff --git a/src/modules/launcher/Wox.Plugin/Common/DefaultBrowserInfo.cs b/src/modules/launcher/Wox.Plugin/Common/DefaultBrowserInfo.cs
@@ -15,7 +15,6 @@ namespace Wox.Plugin.Common
     public static class DefaultBrowserInfo
     {
         private static readonly object _updateLock = new object();
-        private static int _lastUpdateTickCount = -1;
 
         /// <summary>Gets the path to the MS Edge browser executable.</summary>
         public static string MSEdgePath =>
@@ -41,16 +40,20 @@ public static class DefaultBrowserInfo
 
         public static bool IsDefaultBrowserSet { get => !string.IsNullOrEmpty(Path); }
 
-        public const int UpdateTimeout = 300;
+        public const long UpdateTimeout = 300;
+
+        private static long _lastUpdateTickCount = -UpdateTimeout;
+
+        private static bool haveIRanUpdateOnce;
 
         /// <summary>
         /// Updates only if at least more than 300ms has passed since the last update, to avoid multiple calls to <see cref="Update"/>.
         /// (because of multiple plugins calling update at the same time.)
         /// </summary>
         public static void UpdateIfTimePassed()
         {
-            int curTickCount = Environment.TickCount;
-            if (curTickCount - _lastUpdateTickCount > UpdateTimeout)
+            long curTickCount = Environment.TickCount64;
+            if (curTickCount - _lastUpdateTickCount >= UpdateTimeout)
             {
                 _lastUpdateTickCount = curTickCount;
                 Update();
@@ -66,6 +69,12 @@ public static void Update()
         {
             lock (_updateLock)
             {
+                if (!haveIRanUpdateOnce)
+                {
+                    Log.Warn("I've tried updating the chosen Web Browser info at least once.", typeof(DefaultBrowserInfo));
+                    haveIRanUpdateOnce = true;
+                }
+
                 try
                 {
                     string progId = GetRegistryValue(