prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove unnecessary dependencies

Browse source
This commit is contained in:
Yusyuriv 2025-03-20 14:03:08 +06:00
parent 02d09160a3
commit d2c185ee92
No known key found for this signature in database
GPG key ID: A91C52E6F73148E0
3 changed files with 8 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs
View file

@ -4,8 +4,7 @@ using System.IO;
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 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader
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)
@ -212,15 +211,7 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader
{
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)
{

33
Plugins/Flow.Launcher.Plugin.BrowserBookmark/FirefoxBookmarkLoader.cs
View file

@ -5,7 +5,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using Flow.Launcher.Infrastructure.Logger;
using SkiaSharp;
namespace Flow.Launcher.Plugin.BrowserBookmark;
@ -142,7 +141,8 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
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))
{
@ -171,12 +171,12 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
{
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");
}
@ -185,30 +185,7 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
{
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)
{

3
Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
View file

@ -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>