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

Separate image loading logic

Browse source 
1. Separate image loading logic
2. Make IconDelegate async while calling to avoid blocking UI thread
This commit is contained in:
Vic 2022-11-29 19:26:29 +08:00
parent 5a7eb621ab
commit aeb72d2604
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Flow.Launcher/ViewModel/ResultViewModel.cs
View file

@ -173,50 +173,53 @@ namespace Flow.Launcher.ViewModel
public GlyphInfo Glyph { get; set; } public GlyphInfo Glyph { get; set; }
private async Task LoadImageAsync() private async Task<ImageSource> LoadImageInternalAsync(string imagePath, Result.IconDelegate icon, bool loadFullImage)
{ {
var imagePath = Result.IcoPath; if (string.IsNullOrEmpty(imagePath) && icon != null)
if (string.IsNullOrEmpty(imagePath) && Result.Icon != null)
{ {
try try
{ {
image = Result.Icon(); var image = await Task.Run(() => icon()).ConfigureAwait(false);
return; return image;
} }
catch (Exception e) catch (Exception e)
{ {
Log.Exception( Log.Exception(
$"|ResultViewModel.Image|IcoPath is empty and exception when calling Icon() for result <{Result.Title}> of plugin <{Result.PluginDirectory}>", $"|ResultViewModel.LoadImageInternalAsync|IcoPath is empty and exception when calling IconDelegate for result <{Result.Title}> of plugin <{Result.PluginDirectory}>",
e); e);
} }
} }
var loadFullImage = (Path.GetExtension(imagePath) ?? "").Equals(".url", StringComparison.OrdinalIgnoreCase); return await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);
if (ImageLoader.CacheContainImage(imagePath))
{
// will get here either when icoPath has value\icon delegate is null\when had exception in delegate
image = await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);
return;
}
// We need to modify the property not field here to trigger the OnPropertyChanged event
Image = await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);
} }
private async Task LoadImageAsync()
{
var imagePath = Result.IcoPath;
var iconDelegate = Result.Icon;
if (ImageLoader.CacheContainImage(imagePath, false))
{
image = await LoadImageInternalAsync(imagePath, iconDelegate, false).ConfigureAwait(false);
}
else
{
// We need to modify the property not field here to trigger the OnPropertyChanged event
Image = await LoadImageInternalAsync(imagePath, iconDelegate, false).ConfigureAwait(false);
}
}
private async Task LoadPreviewImageAsync() private async Task LoadPreviewImageAsync()
{ {
var imagePath = Result.PreviewImage ?? Result.IcoPath; var imagePath = Result.PreviewImage ?? Result.IcoPath;
if (imagePath == null && Result.Icon != null) var iconDelegate = Result.Icon;
if (ImageLoader.CacheContainImage(imagePath, true))
{ {
// For UWP programs from program plugin previewImage = await LoadImageInternalAsync(imagePath, iconDelegate, true).ConfigureAwait(false);
// TODO: Consider https://github.com/Flow-Launcher/Flow.Launcher/pull/1492#issuecomment-1304829947
PreviewImage = Result.Icon();
} }
else else
{ {
PreviewImage = await ImageLoader.LoadAsync(imagePath, true).ConfigureAwait(false); // We need to modify the property not field here to trigger the OnPropertyChanged event
PreviewImage = await LoadImageInternalAsync(imagePath, iconDelegate, true).ConfigureAwait(false);
} }
} }