From b68b299cd49271013e5f31f3bed4203076da9437 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 4 Jun 2025 23:26:32 +0800
Subject: [PATCH] Support enable favorite icons for firefox bookmarks

---
 .../FirefoxBookmarkLoader.cs                  | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
index 75f26d322..5cbd92586 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
@@ -41,30 +41,33 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
         if (string.IsNullOrEmpty(placesPath) || !File.Exists(placesPath))
             return bookmarks;
 
+        // Try to register file monitoring
+        try
+        {
+            Main.RegisterBookmarkFile(placesPath);
+        }
+        catch (Exception ex)
+        {
+            Main._context.API.LogException(ClassName, $"Failed to register Firefox bookmark file monitoring: {placesPath}", ex);
+            return bookmarks;
+        }
+
         var tempDbPath = Path.Combine(_faviconCacheDir, $"tempplaces_{Guid.NewGuid()}.sqlite");
 
         try
         {
-            // Try to register file monitoring
-            try
-            {
-                Main.RegisterBookmarkFile(placesPath);
-            }
-            catch (Exception ex)
-            {
-                Main._context.API.LogException(ClassName, $"Failed to register Firefox bookmark file monitoring: {placesPath}", ex);
-            }
-
             // Use a copy to avoid lock issues with the original file
             File.Copy(placesPath, tempDbPath, true);
 
-            // Connect to database and execute query
+            // Create the connection string and init the connection
             string dbPath = string.Format(DbPathFormat, tempDbPath);
             using var dbConnection = new SqliteConnection(dbPath);
+
+            // Open connection to the database file and execute the query
             dbConnection.Open();
             var reader = new SqliteCommand(QueryAllBookmarks, dbConnection).ExecuteReader();
 
-            // Create bookmark list
+            // Get results in List<Bookmark> format
             bookmarks = reader
                 .Select(
                     x => new Bookmark(
@@ -75,12 +78,16 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
                 )
                 .ToList();
 
-            // Path to favicon database
-            var faviconDbPath = Path.Combine(Path.GetDirectoryName(placesPath), "favicons.sqlite");
-            if (File.Exists(faviconDbPath))
+            // Load favicons after loading bookmarks
+            if (Main._settings.EnableFavoriteIcons)
             {
-                LoadFaviconsFromDb(faviconDbPath, bookmarks);
+                var faviconDbPath = Path.Combine(Path.GetDirectoryName(placesPath), "favicons.sqlite");
+                if (File.Exists(faviconDbPath))
+                {
+                    LoadFaviconsFromDb(faviconDbPath, bookmarks);
+                }
             }
+
             // https://github.com/dotnet/efcore/issues/26580
             SqliteConnection.ClearPool(dbConnection);
             dbConnection.Close();