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

Reduce nesting

Browse source
This commit is contained in:
Yusyuriv 2025-03-20 14:43:38 +06:00
parent 0c162b1cbe
commit 92ef2c76c7
No known key found for this signature in database
GPG key ID: A91C52E6F73148E0
2 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,21 +171,21 @@ public abstract class ChromiumBookmarkLoader : IBookmarkLoader
cmd.Parameters.AddWithValue("@url", $"%{domain}%"); cmd.Parameters.AddWithValue("@url", $"%{domain}%");
using var reader = cmd.ExecuteReader(); using var reader = cmd.ExecuteReader();
if (reader.Read() && !reader.IsDBNull(1)) if (!reader.Read() || reader.IsDBNull(1))
{ continue;
var iconId = reader.GetInt64(0).ToString();
var imageData = (byte[])reader["image_data"];
if (imageData != null && imageData.Length > 0) var iconId = reader.GetInt64(0).ToString();
{ var imageData = (byte[])reader["image_data"];
var faviconPath = Path.Combine(_faviconCacheDir, $"{domain}_{iconId}.png");
if (!File.Exists(faviconPath)) if (imageData is not { Length: > 0 })
{ continue;
SaveBitmapData(imageData, faviconPath);
} var faviconPath = Path.Combine(_faviconCacheDir, $"{domain}_{iconId}.png");
bookmark.FaviconPath = faviconPath; if (!File.Exists(faviconPath))
} {
SaveBitmapData(imageData, faviconPath);
} }
bookmark.FaviconPath = faviconPath;
} }
catch (Exception ex) catch (Exception ex)
{ {

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

@ -145,22 +145,23 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
cmd.Parameters.AddWithValue("@url", $"%{domain}%"); cmd.Parameters.AddWithValue("@url", $"%{domain}%");
using var reader = cmd.ExecuteReader(); using var reader = cmd.ExecuteReader();
if (reader.Read() && !reader.IsDBNull(0)) if (!reader.Read() || reader.IsDBNull(0))
continue;
var imageData = (byte[])reader["data"];
if (imageData is not { Length: > 0 })
continue;
var ext = IsSvgData(imageData) ? "svg" : "png";
var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.{ext}");
if (!File.Exists(faviconPath))
{ {
var imageData = (byte[])reader["data"]; SaveBitmapData(imageData, faviconPath);
if (imageData != null && imageData.Length > 0)
{
var ext = IsSvgData(imageData) ? "svg" : "png";
var faviconPath = Path.Combine(_faviconCacheDir, $"firefox_{domain}.{ext}");
if (!File.Exists(faviconPath))
{
SaveBitmapData(imageData, faviconPath);
}
bookmark.FaviconPath = faviconPath;
}
} }
bookmark.FaviconPath = faviconPath;
} }
catch (Exception ex) catch (Exception ex)
{ {