Avoid double thumbnail cache key resolving

Author: d2dyno1

src/Sdk/SecureFolderFS.Sdk/AppModels/ThumbnailCacheModel.cs

@@ -45,16 +45,14 @@ public ThumbnailCacheModel(int maxEntries)
         /// Tries to get a cached thumbnail for the specified file.
         /// The cache key includes the file's modification date, so modified files automatically get new thumbnails.
         /// </summary>
-        /// <param name="file">The file to get the cached thumbnail for.</param>
+        /// <param name="cacheKey">A unique cache ID.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. Value is the cached thumbnail stream if found, otherwise null.</returns>
-        public async Task<Stream?> TryGetCachedThumbnailAsync(IFile file, CancellationToken cancellationToken = default)
+        public async Task<Stream?> TryGetCachedThumbnailAsync(string cacheKey, CancellationToken cancellationToken = default)
         {
             try
             {
-                var cacheKey = await GetCacheKeyAsync(file, cancellationToken);
                 var cachedData = await _database.GetValueAsync<byte[]>(cacheKey, cancellationToken: cancellationToken);
-
                 if (cachedData is null || cachedData.Length == 0)
                     return null;
 
@@ -70,16 +68,14 @@ public ThumbnailCacheModel(int maxEntries)
         /// Caches the thumbnail for the specified file.
         /// The cache key includes the file's modification date, ensuring modified files get fresh thumbnails.
         /// </summary>
-        /// <param name="file">The file to cache the thumbnail for.</param>
+        /// <param name="cacheKey">A unique cache ID.</param>
         /// <param name="thumbnailStream">The thumbnail stream to cache.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
-        public async Task CacheThumbnailAsync(IFile file, IImageStream thumbnailStream, CancellationToken cancellationToken = default)
+        public async Task CacheThumbnailAsync(string cacheKey, IImageStream thumbnailStream, CancellationToken cancellationToken = default)
         {
             try
             {
-                var cacheKey = await GetCacheKeyAsync(file, cancellationToken);
-
                 // Copy thumbnail to byte array
                 using var memoryStream = new MemoryStream();
                 await thumbnailStream.CopyToAsync(memoryStream, cancellationToken);
@@ -111,7 +107,7 @@ public Task ClearCacheAsync(CancellationToken cancellationToken = default)
         /// <param name="file">The file to generate a cache key for.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A unique cache key string.</returns>
-        private static async Task<string> GetCacheKeyAsync(IFile file, CancellationToken cancellationToken)
+        public static async Task<string> GetCacheKeyAsync(IFile file, CancellationToken cancellationToken)
         {
             var pathHash = GetPathHash(file.Id);
             var dateModified = await file.GetDateModifiedAsync(cancellationToken);

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Storage/Browser/FileViewModel.cs

@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OwlCore.Storage;
+using SecureFolderFS.Sdk.AppModels;
 using SecureFolderFS.Sdk.Attributes;
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Extensions;
@@ -50,14 +51,12 @@ public override async Task InitAsync(CancellationToken cancellationToken = defau
         {
             Thumbnail?.Dispose();
 
-            if (!SettingsService.UserSettings.AreThumbnailsEnabled)
-                return;
-
-            if (!CanLoadThumbnail())
+            if (!SettingsService.UserSettings.AreThumbnailsEnabled || !CanLoadThumbnail())
                 return;
 
             // Try to get from the cache first
-            var cachedStream = await BrowserViewModel.ThumbnailCache.TryGetCachedThumbnailAsync(File, cancellationToken);
+            var cacheKey = await ThumbnailCacheModel.GetCacheKeyAsync(File, cancellationToken);
+            var cachedStream = await BrowserViewModel.ThumbnailCache.TryGetCachedThumbnailAsync(cacheKey, cancellationToken);
             if (cachedStream is not null)
             {
                 Thumbnail = new StreamImageModel(cachedStream);
@@ -72,7 +71,7 @@ public override async Task InitAsync(CancellationToken cancellationToken = defau
 
             // Show and cache the generated thumbnail
             Thumbnail = generatedThumbnail;
-            _ = BrowserViewModel.ThumbnailCache.CacheThumbnailAsync(File, generatedThumbnail, cancellationToken);
+            _ = BrowserViewModel.ThumbnailCache.CacheThumbnailAsync(cacheKey, generatedThumbnail, cancellationToken);
         }
 
         /// <summary>

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Storage/Browser/SearchBrowserItemViewModel.cs

@@ -67,7 +67,8 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
             if (!CanLoadThumbnail() || Inner is not IFile file || Classification is not { TypeHint: var typeHint })
                 return;
 
-            var cachedStream = await _thumbnailCache.TryGetCachedThumbnailAsync(file, cancellationToken).ConfigureAwait(false);
+            var cacheKey = await ThumbnailCacheModel.GetCacheKeyAsync(file, cancellationToken).ConfigureAwait(false);
+            var cachedStream = await _thumbnailCache.TryGetCachedThumbnailAsync(cacheKey, cancellationToken).ConfigureAwait(false);
             if (cachedStream is not null)
             {
                 await _uiContext.PostOrExecuteAsync(() =>
@@ -89,7 +90,7 @@ await _uiContext.PostOrExecuteAsync(() =>
                 return Task.CompletedTask;
             });
 
-            _ = _thumbnailCache.CacheThumbnailAsync(file, generatedThumbnail, cancellationToken);
+            _ = _thumbnailCache.CacheThumbnailAsync(cacheKey, generatedThumbnail, cancellationToken);
         }
 
         public bool CanLoadThumbnail()