Merge branch '250320BookmarkFavicon' of https://github.com/onesounds/Flow.Launcher into 250320BookmarkFavicon

Author: Jack251970

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

@@ -4,8 +4,7 @@
 using System.Text.Json;
 using Flow.Launcher.Infrastructure.Logger;
 using System;
-using System.Data.SQLite;
-using SkiaSharp;
+using Microsoft.Data.Sqlite;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark;
 
@@ -143,7 +142,7 @@ private void LoadFaviconsFromDb(string dbPath, List<Bookmark> bookmarks)
 
             try
             {
-                using var connection = new SQLiteConnection($"Data Source={tempDbPath};Version=3;Read Only=True;");
+                using var connection = new SqliteConnection($"Data Source={tempDbPath}");
                 connection.Open();
 
                 foreach (var bookmark in bookmarks)
@@ -219,15 +218,7 @@ private void SaveBitmapData(byte[] imageData, string outputPath)
     {
         try
         {
-            using var ms = new MemoryStream(imageData);
-            using var bitmap = SKBitmap.Decode(ms);
-            if (bitmap != null)
-            {
-                using var image = SKImage.FromBitmap(bitmap);
-                using var data = image.Encode(SKEncodedImageFormat.Png, 100);
-                using var fs = File.OpenWrite(outputPath);
-                data.SaveTo(fs);
-            }
+            File.WriteAllBytes(outputPath, imageData);
         }
         catch (Exception ex)
         {

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

@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using Flow.Launcher.Infrastructure.Logger;
-using SkiaSharp;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark;
 
@@ -149,7 +148,8 @@ ORDER BY i.width DESC  -- Select largest icon available
 
                         if (imageData != null && imageData.Length > 0)
                         {
-                            var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.png");
+                            var ext = IsSvgData(imageData) ? "svg" : "png";
+                            var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.{ext}");
 
                             if (!File.Exists(faviconPath))
                             {
@@ -185,12 +185,12 @@ private bool IsSvgData(byte[] data)
     {
         if (data == null || data.Length < 5)
             return false;
-    
+
         // SVG 파일 시그니처 확인
         // ASCII로 시작하는 SVG XML 헤더 확인
         string header = System.Text.Encoding.ASCII.GetString(data, 0, Math.Min(data.Length, 200)).ToLower();
 
-        return header.Contains("<svg") || 
+        return header.Contains("<svg") ||
                header.StartsWith("<?xml") && header.Contains("<svg") ||
                header.Contains("image/svg+xml");
     }
@@ -199,30 +199,7 @@ private void SaveBitmapData(byte[] imageData, string outputPath)
     {
         try
         {
-            // SVG 파일 시그니처 확인
-            bool isSvg = IsSvgData(imageData);
-        
-            if (isSvg)
-            {
-                // SVG 데이터는 있는 그대로 저장 (.svg 확장자 사용)
-                string svgOutputPath = Path.ChangeExtension(outputPath, ".svg");
-                File.WriteAllBytes(svgOutputPath, imageData);
-                // 원래 경로 대신 SVG 경로를 반환하도록 outputPath 변수를 업데이트
-                File.Copy(svgOutputPath, outputPath, true);
-            }
-            else
-            {
-                // 기존 비트맵 처리 코드
-                using var ms = new MemoryStream(imageData);
-                using var bitmap = SKBitmap.Decode(ms);
-                if (bitmap != null)
-                {
-                    using var image = SKImage.FromBitmap(bitmap);
-                    using var data = image.Encode(SKEncodedImageFormat.Png, 100);
-                    using var fs = File.OpenWrite(outputPath);
-                    data.SaveTo(fs);
-                }
-            }
+            File.WriteAllBytes(outputPath, imageData);
         }
         catch (Exception ex)
         {

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

@@ -96,9 +96,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
-    <PackageReference Include="SkiaSharp" Version="3.116.1" />
-    <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
 </Project>