Force save favicon icons & Fix svg save issue

Author: Jack251970

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

@@ -177,11 +177,9 @@ ORDER BY b.width DESC
                         if (imageData is not { Length: > 0 })
                             continue;
 
-                        var faviconPath = Path.Combine(_faviconCacheDir, $"{domain}_{iconId}.png");
-                        if (!File.Exists(faviconPath))
-                        {
-                            SaveBitmapData(imageData, faviconPath);
-                        }
+                        var faviconPath = Path.Combine(_faviconCacheDir, $"chromium_{domain}_{iconId}.png");
+                        SaveBitmapData(imageData, faviconPath);
+
                         bookmark.FaviconPath = faviconPath;
                     }
                     catch (Exception ex)

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

@@ -155,12 +155,16 @@ ORDER BY i.width DESC  -- Select largest icon available
                     if (imageData is not { Length: > 0 })
                         continue;
 
-                    var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.png");
-
-                    if (!File.Exists(faviconPath))
+                    string faviconPath;
+                    if (IsSvgData(imageData))
+                    {
+                        faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.svg");
+                    }
+                    else
                     {
-                        SaveBitmapData(imageData, faviconPath);
+                        faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.png");
                     }
+                    SaveBitmapData(imageData, faviconPath);
 
                     bookmark.FaviconPath = faviconPath;
                 }
@@ -201,6 +205,15 @@ private static void SaveBitmapData(byte[] imageData, string outputPath)
             Main._context.API.LogException(ClassName, $"Failed to save image: {outputPath}", ex);
         }
     }
+
+    private static bool IsSvgData(byte[] data)
+    {
+        if (data.Length < 5)
+            return false;
+        string start = System.Text.Encoding.ASCII.GetString(data, 0, Math.Min(100, data.Length));
+        return start.Contains("<svg") ||
+               (start.StartsWith("<?xml") && start.Contains("<svg"));
+    }
 }
 
 public class FirefoxBookmarkLoader : FirefoxBookmarkLoaderBase