Reduce nesting

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

View file

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

View file

@ -145,22 +145,23 @@ public abstract class FirefoxBookmarkLoaderBase : IBookmarkLoader
cmd.Parameters.AddWithValue("@url", $"%{domain}%");
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"];
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;
}
SaveBitmapData(imageData, faviconPath);
}
bookmark.FaviconPath = faviconPath;
}
catch (Exception ex)
{