Skip to content

Fix ImageCache when loading full image #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 29, 2022
Merged

Fix ImageCache when loading full image #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5c4805
Fix ImageCache when loading full image
VictoriousRaptor Dec 28, 2022
a40e15f
Remove duplicate null check
VictoriousRaptor Dec 29, 2022
25ec843
Merge branch 'dev' into FixImageCache
Garulf Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Flow.Launcher.Infrastructure/Image/ImageCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Media;

namespace Flow.Launcher.Infrastructure.Image
Expand Down
8 changes: 2 additions & 6 deletions Flow.Launcher.Infrastructure/Image/ImageLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private static BitmapSource GetThumbnail(string path, ThumbnailOptions option =

public static bool CacheContainImage(string path, bool loadFullImage = false)
{
return ImageCache.ContainsKey(path, false) && ImageCache[path, loadFullImage] != null;
return ImageCache.ContainsKey(path, loadFullImage);
}

public static bool TryGetValue(string path, bool loadFullImage, out ImageSource image)
Expand All @@ -264,10 +264,6 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
if (imageResult.ImageType != ImageType.Error && imageResult.ImageType != ImageType.Cache)
{ // we need to get image hash
string hash = EnableImageHash ? _hashGenerator.GetHashFromImage(img) : null;
if (imageResult.ImageType == ImageType.FullImageFile)
{
path = $"{path}_{ImageType.FullImageFile}";
}
if (hash != null)
{

Expand All @@ -283,7 +279,7 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
}

// update cache
ImageCache[path, false] = img;
ImageCache[path, loadFullImage] = img;
}

return img;
Expand Down