Merge pull request #2152 from VictoriousRaptor/FirefoxBookmark

Fix bookmark plugin file monitoring issue

Author: VictoriousRaptor

.github/actions/spelling/expect.txt

@@ -78,6 +78,7 @@ WCA_ACCENT_POLICY
 HGlobal
 dopusrt
 firefox
+Firefox
 msedge
 svgc
 ime

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs

@@ -10,6 +10,7 @@
 using System.IO;
 using System.Threading.Channels;
 using System.Threading.Tasks;
+using System.Threading;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark
 {
@@ -20,20 +21,39 @@ public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContex
         private static List<Bookmark> cachedBookmarks = new List<Bookmark>();
 
         private static Settings _settings;
-        
+
+        private static bool initialized = false;
+
         public void Init(PluginInitContext context)
         {
             Main.context = context;
-            
+
             _settings = context.API.LoadSettingJsonStorage<Settings>();
 
-            cachedBookmarks = BookmarkLoader.LoadAllBookmarks(_settings);
+            LoadBookmarksIfEnabled();
+        }
 
-            _ = MonitorRefreshQueue();
+        private static void LoadBookmarksIfEnabled()
+        {
+            if (context.CurrentPluginMetadata.Disabled)
+            {
+                // Don't load or monitor files if disabled
+                return;
+            }
+
+            cachedBookmarks = BookmarkLoader.LoadAllBookmarks(_settings);
+            _ = MonitorRefreshQueueAsync();
+            initialized = true;
         }
 
         public List<Result> Query(Query query)
         {
+            // For when the plugin being previously disabled and is now renabled 
+            if (!initialized)
+            {
+                LoadBookmarksIfEnabled();
+            }
+
             string param = query.Search.TrimStart();
 
             // Should top results be returned? (true if no search parameters have been passed)
@@ -86,35 +106,44 @@ public List<Result> Query(Query query)
 
         private static Channel<byte> refreshQueue = Channel.CreateBounded<byte>(1);
 
-        private async Task MonitorRefreshQueue()
+        private static SemaphoreSlim fileMonitorSemaphore = new(1, 1);
+
+        private static async Task MonitorRefreshQueueAsync()
         {
+            if (fileMonitorSemaphore.CurrentCount < 1)
+            {
+                return;
+            }
+            await fileMonitorSemaphore.WaitAsync();
             var reader = refreshQueue.Reader;
             while (await reader.WaitToReadAsync())
             {
-                await Task.Delay(2000);
                 if (reader.TryRead(out _))
                 {
-                    ReloadData();
+                    ReloadAllBookmarks(false);
                 }
             }
+            fileMonitorSemaphore.Release();
         }
 
         private static readonly List<FileSystemWatcher> Watchers = new();
 
         internal static void RegisterBookmarkFile(string path)
         {
             var directory = Path.GetDirectoryName(path);
-            if (!Directory.Exists(directory))
+            if (!Directory.Exists(directory) || !File.Exists(path))
+            {
                 return;
-            var watcher = new FileSystemWatcher(directory!);
-            if (File.Exists(path))
+            }
+            if (Watchers.Any(x => x.Path.Equals(directory, StringComparison.OrdinalIgnoreCase)))
             {
-                var fileName = Path.GetFileName(path);
-                watcher.Filter = fileName;
+                return;
             }
+            
+            var watcher = new FileSystemWatcher(directory!);
+            watcher.Filter = Path.GetFileName(path);
 
             watcher.NotifyFilter = NotifyFilters.FileName |
-                                   NotifyFilters.LastAccess |
                                    NotifyFilters.LastWrite |
                                    NotifyFilters.Size;
 
@@ -129,7 +158,7 @@ internal static void RegisterBookmarkFile(string path)
             };
 
             watcher.EnableRaisingEvents = true;
-
+            
             Watchers.Add(watcher);
         }
 
@@ -138,11 +167,12 @@ public void ReloadData()
             ReloadAllBookmarks();
         }
 
-        public static void ReloadAllBookmarks()
+        public static void ReloadAllBookmarks(bool disposeFileWatchers = true)
         {
             cachedBookmarks.Clear();
-
-            cachedBookmarks = BookmarkLoader.LoadAllBookmarks(_settings);
+            if (disposeFileWatchers)
+                DisposeFileWatchers();
+            LoadBookmarksIfEnabled();
         }
 
         public string GetTranslatedPluginTitle()
@@ -196,12 +226,19 @@ internal class BookmarkAttributes
         {
             internal string Url { get; set; }
         }
+
         public void Dispose()
+        {
+            DisposeFileWatchers();
+        }
+
+        private static void DisposeFileWatchers()
         {
             foreach (var watcher in Watchers)
             {
                 watcher.Dispose();
             }
+            Watchers.Clear();
         }
     }
 }