diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs index 83f794f5d..7aabc4190 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs @@ -63,7 +63,7 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader return bookmarks; } - protected List LoadBookmarksFromFile(string path, string source) + protected static List LoadBookmarksFromFile(string path, string source) { var bookmarks = new List(); @@ -77,7 +77,7 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader return bookmarks; } - private void EnumerateRoot(JsonElement rootElement, ICollection bookmarks, string source) + private static void EnumerateRoot(JsonElement rootElement, ICollection bookmarks, string source) { foreach (var folder in rootElement.EnumerateObject()) { @@ -92,7 +92,7 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader } } - private void EnumerateFolderBookmark(JsonElement folderElement, ICollection bookmarks, + private static void EnumerateFolderBookmark(JsonElement folderElement, ICollection bookmarks, string source) { if (!folderElement.TryGetProperty("children", out var childrenElement)) @@ -201,6 +201,8 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader // Delete temporary file try { + // https://github.com/dotnet/efcore/issues/26580 + SqliteConnection.ClearAllPools(); File.Delete(tempDbPath); } catch (Exception ex) @@ -214,7 +216,7 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader } } - private void SaveBitmapData(byte[] imageData, string outputPath) + private static void SaveBitmapData(byte[] imageData, string outputPath) { try { diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs index df2fc028c..187b77224 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs @@ -86,6 +86,8 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader // Delete temporary file try { + // https://github.com/dotnet/efcore/issues/26580 + SqliteConnection.ClearAllPools(); File.Delete(tempDbPath); } catch (Exception ex) @@ -168,6 +170,8 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader // Delete temporary file try { + // https://github.com/dotnet/efcore/issues/26580 + SqliteConnection.ClearAllPools(); File.Delete(tempDbPath); } catch (Exception ex) @@ -181,7 +185,7 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader } } - private bool IsSvgData(byte[] data) + private static bool IsSvgData(byte[] data) { if (data == null || data.Length < 5) return false; @@ -195,7 +199,7 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader header.Contains("image/svg+xml"); } - private void SaveBitmapData(byte[] imageData, string outputPath) + private static void SaveBitmapData(byte[] imageData, string outputPath) { try { @@ -221,7 +225,7 @@ public class FirefoxBookmarkLoader : FirefoxBookmarkLoaderBase /// /// Path to places.sqlite /// - private string PlacesPath + private static string PlacesPath { get {