Fix CPU / thread locks + improve performance of BrowserBookmark plugin

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

@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Flow.Launcher.Plugin.BrowserBookmark.Helper;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
-using Microsoft.Data.Sqlite;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark;
 
@@ -27,40 +26,27 @@
     {
         var bookmarks = new List<Bookmark>();
         if (!Directory.Exists(browserDataPath)) return bookmarks;
+
+        // Watch the entire user data directory for changes to catch journal file writes.
+        Main.RegisterBrowserDataDirectory(browserDataPath);
+
         var paths = Directory.GetDirectories(browserDataPath);
 
         foreach (var profile in paths)
         {
             var bookmarkPath = Path.Combine(profile, "Bookmarks");
-            if (!File.Exists(bookmarkPath))
-                continue;
-
-            // Register bookmark file monitoring (direct call to Main.RegisterBookmarkFile)
-            try
-            {
-                if (File.Exists(bookmarkPath))
-                {
-                    Main.RegisterBookmarkFile(bookmarkPath);
-                }
-            }
-            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
             if (Main._settings.EnableFavicons)
             {
                 var faviconDbPath = Path.Combine(profile, "Favicons");
                 if (File.Exists(faviconDbPath))
                 {
                     Main._context.API.StopwatchLogInfo(ClassName, $"Load {profileBookmarks.Count} favicons cost", () =>
                     {
                         LoadFaviconsFromDb(faviconDbPath, profileBookmarks);
                     });
                 }
             }
@@ -78,10 +64,18 @@
         if (!File.Exists(path))
             return bookmarks;
 
-        using var jsonDocument = JsonDocument.Parse(File.ReadAllText(path));
-        if (!jsonDocument.RootElement.TryGetProperty("roots", out var rootElement))
-            return bookmarks;
-        EnumerateRoot(rootElement, bookmarks, source);
+        try
+        {
+            using var jsonDocument = JsonDocument.Parse(File.ReadAllText(path));
+            if (!jsonDocument.RootElement.TryGetProperty("roots", out var rootElement))
+                return bookmarks;
+            EnumerateRoot(rootElement, bookmarks, source);
+        }
+        catch (JsonException e)
+        {
+            Main._context.API.LogException(ClassName, $"Failed to parse bookmarks file: {path}", e);
+        }
+
         return bookmarks;
     }
 
@@ -115,24 +109,27 @@
                     case "workspace": // Edge Workspace
                         EnumerateFolderBookmark(subElement, bookmarks, source);
                         break;
-                    default:
-                        bookmarks.Add(new Bookmark(
-                            subElement.GetProperty("name").GetString(),
-                            subElement.GetProperty("url").GetString(),
-                            source));
+                    case "url":
+                        if (subElement.TryGetProperty("name", out var name) &&
+                            subElement.TryGetProperty("url", out var url))
+                        {
+                            bookmarks.Add(new Bookmark(name.GetString(), url.GetString(), source));
+                        }
                         break;
                 }
             }
             else
             {
-                Main._context.API.LogError(ClassName, $"type property not found for {subElement.GetString()}");
+                Main._context.API.LogError(ClassName, $"type property not found for {subElement.GetString() ?? string.Empty}");
             }
         }
     }
 
     private void LoadFaviconsFromDb(string dbPath, List<Bookmark> bookmarks)
     {
-        FaviconHelper.LoadFaviconsFromDb(_faviconCacheDir, dbPath, (tempDbPath) =>
+        if (!File.Exists(dbPath)) return;
+
+        FaviconHelper.ExecuteWithTempDb(_faviconCacheDir, dbPath, tempDbPath =>
         {
             // Since some bookmarks may have same favicon id, we need to record them to avoid duplicates
             var savedPaths = new ConcurrentDictionary<string, bool>();
@@ -142,62 +139,58 @@
             {
                 // Use read-only connection to avoid locking issues
                 // Do not use pooling so that we do not need to clear pool: https://github.com/dotnet/efcore/issues/26580
-                var connection = new SqliteConnection($"Data Source={tempDbPath};Mode=ReadOnly;Pooling=false");
+                if (string.IsNullOrEmpty(bookmark.Url) || !Uri.TryCreate(bookmark.Url, UriKind.Absolute, out var uri))
+                    return;
+
+                using var connection = new SqliteConnection($"Data Source={tempDbPath};Mode=ReadOnly;Pooling=false");
                 connection.Open();
 
                 try
                 {
-                    var url = bookmark.Url;
-                    if (string.IsNullOrEmpty(url)) return;
-
-                    // Extract domain from URL
-                    if (!Uri.TryCreate(url, UriKind.Absolute, out Uri uri))
-                        return;
-
-                    var domain = uri.Host;
-
                     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
+                        WHERE m.page_url GLOB @pattern
                         ORDER BY b.width DESC
                         LIMIT 1";
 
-                    cmd.Parameters.AddWithValue("@url", $"%{domain}%");
+                    cmd.Parameters.AddWithValue("@pattern", $"http*{uri.Host}/*");
 
                     using var reader = cmd.ExecuteReader();
-                    if (!reader.Read() || reader.IsDBNull(1))
+                    if (!reader.Read())
                         return;
 
-                    var iconId = reader.GetInt64(0).ToString();
+                    var id = reader.GetInt64(0).ToString();
                     var imageData = (byte[])reader["image_data"];
 
                     if (imageData is not { Length: > 0 })
                         return;
 
-                    var faviconPath = Path.Combine(_faviconCacheDir, $"chromium_{domain}_{iconId}.png");
+                    var faviconPath = Path.Combine(_faviconCacheDir, $"chromium_{uri.Host}_{id}.png");
 
-                    // Filter out duplicate favicons
                     if (savedPaths.TryAdd(faviconPath, true))
                     {
-                        FaviconHelper.SaveBitmapData(imageData, faviconPath);
+                        if (FaviconHelper.SaveBitmapData(imageData, faviconPath))
+                            bookmark.FaviconPath = faviconPath;
+                    }
+                    else
+                    {
+                        bookmark.FaviconPath = faviconPath;
                     }
-
-                    bookmark.FaviconPath = faviconPath;
                 }
                 catch (Exception ex)
                 {
-                    Main._context.API.LogException(ClassName, $"Failed to extract bookmark favicon: {bookmark.Url}", ex);
+                    Main._context.API.LogException(ClassName, $"Failed to extract favicon for: {bookmark.Url}", ex);
                 }
                 finally
                 {
                     // Cache connection and clear pool after all operations to avoid issue:
                     // ObjectDisposedException: Safe handle has been closed.
+                    SqliteConnection.ClearPool(connection);
                     connection.Close();
-                    connection.Dispose();
                 }
             });
         });

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

@@ -1,5 +1,6 @@
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Collections.Generic;
+using System.IO;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark;