Skip to content

Commit d2c185e

Browse files
committed
Remove unnecessary dependencies
1 parent 02d0916 commit d2c185e

File tree

3 files changed

+8
-43
lines changed

3 files changed

+8
-43
lines changed

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
using System.Text.Json;
55
using Flow.Launcher.Infrastructure.Logger;
66
using System;
7-
using System.Data.SQLite;
8-
using SkiaSharp;
7+
using Microsoft.Data.Sqlite;
98

109
namespace Flow.Launcher.Plugin.BrowserBookmark;
1110

@@ -143,7 +142,7 @@ private void LoadFaviconsFromDb(string dbPath, List<Bookmark> bookmarks)
143142

144143
try
145144
{
146-
using var connection = new SQLiteConnection($"Data Source={tempDbPath};Version=3;Read Only=True;");
145+
using var connection = new SqliteConnection($"Data Source={tempDbPath}");
147146
connection.Open();
148147

149148
foreach (var bookmark in bookmarks)
@@ -212,15 +211,7 @@ private void SaveBitmapData(byte[] imageData, string outputPath)
212211
{
213212
try
214213
{
215-
using var ms = new MemoryStream(imageData);
216-
using var bitmap = SKBitmap.Decode(ms);
217-
if (bitmap != null)
218-
{
219-
using var image = SKImage.FromBitmap(bitmap);
220-
using var data = image.Encode(SKEncodedImageFormat.Png, 100);
221-
using var fs = File.OpenWrite(outputPath);
222-
data.SaveTo(fs);
223-
}
214+
File.WriteAllBytes(outputPath, imageData);
224215
}
225216
catch (Exception ex)
226217
{

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

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.IO;
66
using System.Linq;
77
using Flow.Launcher.Infrastructure.Logger;
8-
using SkiaSharp;
98

109
namespace Flow.Launcher.Plugin.BrowserBookmark;
1110

@@ -142,7 +141,8 @@ ORDER BY i.width DESC -- Select largest icon available
142141

143142
if (imageData != null && imageData.Length > 0)
144143
{
145-
var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.png");
144+
var ext = IsSvgData(imageData) ? "svg" : "png";
145+
var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.{ext}");
146146

147147
if (!File.Exists(faviconPath))
148148
{
@@ -171,12 +171,12 @@ private bool IsSvgData(byte[] data)
171171
{
172172
if (data == null || data.Length < 5)
173173
return false;
174-
174+
175175
// SVG 파일 시그니처 확인
176176
// ASCII로 시작하는 SVG XML 헤더 확인
177177
string header = System.Text.Encoding.ASCII.GetString(data, 0, Math.Min(data.Length, 200)).ToLower();
178178

179-
return header.Contains("<svg") ||
179+
return header.Contains("<svg") ||
180180
header.StartsWith("<?xml") && header.Contains("<svg") ||
181181
header.Contains("image/svg+xml");
182182
}
@@ -185,30 +185,7 @@ private void SaveBitmapData(byte[] imageData, string outputPath)
185185
{
186186
try
187187
{
188-
// SVG 파일 시그니처 확인
189-
bool isSvg = IsSvgData(imageData);
190-
191-
if (isSvg)
192-
{
193-
// SVG 데이터는 있는 그대로 저장 (.svg 확장자 사용)
194-
string svgOutputPath = Path.ChangeExtension(outputPath, ".svg");
195-
File.WriteAllBytes(svgOutputPath, imageData);
196-
// 원래 경로 대신 SVG 경로를 반환하도록 outputPath 변수를 업데이트
197-
File.Copy(svgOutputPath, outputPath, true);
198-
}
199-
else
200-
{
201-
// 기존 비트맵 처리 코드
202-
using var ms = new MemoryStream(imageData);
203-
using var bitmap = SKBitmap.Decode(ms);
204-
if (bitmap != null)
205-
{
206-
using var image = SKImage.FromBitmap(bitmap);
207-
using var data = image.Encode(SKEncodedImageFormat.Png, 100);
208-
using var fs = File.OpenWrite(outputPath);
209-
data.SaveTo(fs);
210-
}
211-
}
188+
File.WriteAllBytes(outputPath, imageData);
212189
}
213190
catch (Exception ex)
214191
{

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@
9696

9797
<ItemGroup>
9898
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
99-
<PackageReference Include="SkiaSharp" Version="3.116.1" />
100-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
101-
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
10299
</ItemGroup>
103100

104101
</Project>

0 commit comments

Comments
 (0)