Support enable/disable Favicons & use concurrency to speed up loading

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

@@ -43,16 +43,23 @@
             catch (Exception ex)
             {
                 Main._context.API.LogException(ClassName, $"Failed to register bookmark file monitoring: {bookmarkPath}", ex);
+                continue;
             }
 
             var source = name + (Path.GetFileName(profile) == "Default" ? "" : $" ({Path.GetFileName(profile)})");
             var profileBookmarks = LoadBookmarksFromFile(bookmarkPath, source);
 
             // Load favicons after loading bookmarks
-            var faviconDbPath = Path.Combine(profile, "Favicons");
-            if (File.Exists(faviconDbPath))
+            if (Main._settings.EnableFavoriteIcons)
             {
-                LoadFaviconsFromDb(faviconDbPath, profileBookmarks);
+                var faviconDbPath = Path.Combine(profile, "Favicons");
+                if (File.Exists(faviconDbPath))
+                {
+                    Main._context.API.StopwatchLogInfo(ClassName, $"Load {profileBookmarks.Count} favorite icons cost", () =>
+                    {
+                        LoadFaviconsFromDb(faviconDbPath, profileBookmarks);
+                    });
+                }
             }
 
             bookmarks.AddRange(profileBookmarks);
@@ -120,7 +127,7 @@
         }
     }
 
     private void LoadFaviconsFromDb(string dbPath, List<Bookmark> bookmarks)
     {
         // Use a copy to avoid lock issues with the original file
         var tempDbPath = Path.Combine(_faviconCacheDir, $"tempfavicons_{Guid.NewGuid()}.db");
@@ -167,7 +174,7 @@
                     using var cmd = connection.CreateCommand();
                     cmd.CommandText = @"
                             SELECT f.id, b.image_data
                             FROM favicons f
                             JOIN favicon_bitmaps b ON f.id = b.icon_id
                             JOIN icon_mapping m ON f.id = m.icon_id
                             WHERE m.page_url LIKE @url

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

@@ -22,10 +22,10 @@
 
     // Updated query - removed favicon_id column
     private const string QueryAllBookmarks = """
         SELECT moz_places.url, moz_bookmarks.title
         FROM moz_places
             INNER JOIN moz_bookmarks ON (
                 moz_bookmarks.fk NOT NULL AND moz_bookmarks.title NOT NULL AND moz_bookmarks.fk = moz_places.id
             )
         ORDER BY moz_places.visit_count DESC
         """;
@@ -41,30 +41,33 @@
         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,20 @@
                 )
                 .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))
+                {
+                    Main._context.API.StopwatchLogInfo(ClassName, $"Load {bookmarks.Count} favorite icons cost", () =>
+                    {
+                        LoadFaviconsFromDb(faviconDbPath, bookmarks);
+                    });
+                }
             }
+
+            // Close the connection so that we can delete the temporary file
             // https://github.com/dotnet/efcore/issues/26580
             SqliteConnection.ClearPool(dbConnection);
             dbConnection.Close();
@@ -93,7 +104,10 @@
         // Delete temporary file
         try
         {
-            File.Delete(tempDbPath);
+            if (File.Exists(tempDbPath))
+            {
+                File.Delete(tempDbPath);
+            }
         }
         catch (Exception ex)
         {

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml

@@ -27,4 +27,6 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserEngine">Browser Engine</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage01">If you are not using Chrome, Firefox or Edge, or you are using their portable version, you need to add bookmarks data directory and select correct browser engine to make this plugin work.</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_guideMessage02">For example: Brave's engine is Chromium; and its default bookmarks data location is: "%LOCALAPPDATA%\BraveSoftware\Brave-Browser\UserData". For Firefox engine, the bookmarks directory is the userdata folder contains the places.sqlite file.</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_enable_favorite_icons">Load favorite icons (It may cost much time)</system:String>
+
 </ResourceDictionary>

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

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using System.Threading;
 using System.Windows.Controls;
 using Flow.Launcher.Plugin.BrowserBookmark.Commands;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using Flow.Launcher.Plugin.BrowserBookmark.Views;
-using System.IO;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using System.Threading;
 using Flow.Launcher.Plugin.SharedCommands;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark;
@@ -21,9 +21,9 @@ public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContex
 
     internal static PluginInitContext _context;
 
-    private static List<Bookmark> _cachedBookmarks = new();
+    internal static Settings _settings;
 
-    private static Settings _settings;
+    private static List<Bookmark> _cachedBookmarks = new();
 
     private static bool _initialized = false;
 

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs

@@ -8,6 +8,8 @@ public class Settings : BaseModel
 
     public string BrowserPath { get; set; }
 
+    public bool EnableFavoriteIcons { get; set; } = false;
+
     public bool LoadChromeBookmark { get; set; } = true;
     public bool LoadFirefoxBookmark { get; set; } = true;
     public bool LoadEdgeBookmark { get; set; } = true;

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml

@@ -12,6 +12,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <StackPanel
             Grid.Row="0"
@@ -91,5 +92,12 @@
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
             </StackPanel>
         </StackPanel>
+        <CheckBox
+            Grid.Row="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Content="{DynamicResource flowlauncher_plugin_browserbookmark_enable_favorite_icons}"
+            IsChecked="{Binding Settings.EnableFavoriteIcons}" />
     </Grid>
 </UserControl>