Removed ICachedData

usercode · usercode · commit bd659cf28a6e · 2025-01-25T20:48:01.000+01:00
diff --git a/src/ImageWizard.AWS/AwsLoader.cs b/src/ImageWizard.AWS/AwsLoader.cs
@@ -25,7 +25,7 @@ public AwsLoader(IOptions<AwsOptions> options)
     /// </summary>
     public IAmazonS3 Client { get; }
 
-    public override async Task<LoaderResult> GetAsync(string source, ICachedData? existingCachedImage)
+    public override async Task<LoaderResult> GetAsync(string source, CachedData? existingCachedImage)
     {
         GetObjectRequest request = new GetObjectRequest()
         {
diff --git a/src/ImageWizard.AWS/ImageWizard.AWS.csproj b/src/ImageWizard.AWS/ImageWizard.AWS.csproj
@@ -25,7 +25,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AWSSDK.S3" Version="3.7.412.2" />
+		<PackageReference Include="AWSSDK.S3" Version="3.7.412.4" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/ImageWizard.Analytics/ImageRequestAnalytics.cs b/src/ImageWizard.Analytics/ImageRequestAnalytics.cs
@@ -42,7 +42,7 @@ private void SetData(string? mimeType, Action<AnalyticsDataItem> action)
         }
     }
 
-    public void OnCachedDataSent(ICachedData cachedData, bool notModified)
+    public void OnCachedDataSent(CachedData cachedData, bool notModified)
     {
         SetData(cachedData.Metadata.MimeType, x =>
         {
@@ -59,7 +59,7 @@ public void OnCachedDataSent(ICachedData cachedData, bool notModified)
         });
     }
 
-    public void OnCachedDataCreated(ICachedData cachedData)
+    public void OnCachedDataCreated(CachedData cachedData)
     {
         SetData(cachedData.Metadata.MimeType, x =>
         {
@@ -85,7 +85,7 @@ public void OnInvalidSignature(ImageWizardUrl url)
         });
     }
 
-    public void OnCachedDataDeleted(ICachedData cachedData)
+    public void OnCachedDataDeleted(CachedData cachedData)
     {
         SetData(cachedData.Metadata.MimeType, x =>
         {
diff --git a/src/ImageWizard.Azure/AzureBlobLoader.cs b/src/ImageWizard.Azure/AzureBlobLoader.cs
@@ -23,7 +23,7 @@ public AzureBlobLoader(IOptions<AzureBlobOptions> options)
 
     private BlobContainerClient Client { get; }
 
-    public override async Task<LoaderResult> GetAsync(string source, ICachedData existingCachedImage)
+    public override async Task<LoaderResult> GetAsync(string source, CachedData existingCachedImage)
     {
         BlobClient blob = Client.GetBlobClient(source);
 
diff --git a/src/ImageWizard.Core/Caches/DistributedCache.cs b/src/ImageWizard.Core/Caches/DistributedCache.cs
@@ -35,7 +35,7 @@ private static string GetMetaKey(string key)
         return $"{KeyPrefix}_{key}_meta";
     }
 
-    public async Task<ICachedData?> ReadAsync(string key)
+    public async Task<CachedData?> ReadAsync(string key)
     {
         byte[]? json = await Cache.GetAsync(GetMetaKey(key));
 
@@ -64,7 +64,7 @@ private static string GetMetaKey(string key)
         });
     }
 
-    public async Task WriteAsync(IMetadata metadata, Stream stream)
+    public async Task WriteAsync(Metadata metadata, Stream stream)
     {
         byte[] json = JsonSerializer.SerializeToUtf8Bytes(metadata, ImageWizardJsonSerializerContext.Default.Metadata);
 
diff --git a/src/ImageWizard.Core/Caches/Files/FileCache.cs b/src/ImageWizard.Core/Caches/Files/FileCache.cs
@@ -73,7 +73,7 @@ protected FileInfo GetFileInfo(FileType type, string key)
         return new FileInfo(file);
     }
 
-    public virtual async Task<ICachedData?> ReadAsync(string key)
+    public virtual async Task<CachedData?> ReadAsync(string key)
     {
         Metadata? metadata = await ReadMetadataAsync(key);
 
@@ -92,7 +92,7 @@ protected FileInfo GetFileInfo(FileType type, string key)
         return new CachedData(metadata, () => Task.FromResult<Stream>(blobFile.OpenRead()));
     }
 
-    public virtual async Task WriteAsync(IMetadata metadata, Stream stream)
+    public virtual async Task WriteAsync(Metadata metadata, Stream stream)
     {
         await WriteMetadataAsync(metadata);
 
@@ -130,15 +130,15 @@ public virtual async Task WriteAsync(IMetadata metadata, Stream stream)
 
             return metadata;
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             Logger.LogWarning(ex, $"Reading metadata is failed for key \"{key}\"");
 
-            return null; //simulate "not found".to recreate a new cached data.
+            return null; //simulate "not found" to recreate a new cached data.
         }
     }
 
-    private async Task WriteMetadataAsync(IMetadata metadata)
+    private async Task WriteMetadataAsync(Metadata metadata)
     {
         FileInfo metaFile = GetFileInfo(FileType.Meta, metadata.Key);
 
@@ -156,7 +156,7 @@ private async Task WriteMetadataAsync(IMetadata metadata)
         await JsonSerializer.SerializeAsync(metadataStream, metadata, ImageWizardJsonSerializerContext.Default.Metadata);
     }
 
-    private void Delete(IMetadata metadata)
+    private void Delete(Metadata metadata)
     {
         FileInfo metaFile = GetFileInfo(FileType.Meta, metadata.Key);
         FileInfo blobFile = GetFileInfo(FileType.Blob, metadata.Key);
@@ -227,7 +227,7 @@ public virtual async Task CleanupAsync(CleanupReason reason, CancellationToken c
                             using var w = await CacheLock.WriterLockAsync(key);
 
                             //read metadata
-                            IMetadata? metadata = await ReadMetadataAsync(key);
+                            Metadata? metadata = await ReadMetadataAsync(key);
 
                             if (metadata != null)
                             {
@@ -248,7 +248,7 @@ public virtual async Task CleanupAsync(CleanupReason reason, CancellationToken c
 
     public async Task SetLastAccessAsync(string key, DateTime dateTime)
     {
-        IMetadata? metadata = await ReadMetadataAsync(key);
+        Metadata? metadata = await ReadMetadataAsync(key);
 
         if (metadata == null)
         {
diff --git a/src/ImageWizard.Core/Caches/ICache.cs b/src/ImageWizard.Core/Caches/ICache.cs
@@ -12,15 +12,10 @@ public interface ICache
     /// <summary>
     /// ReadAsync
     /// </summary>
-    /// <param name="key"></param>
-    /// <returns></returns>
-    Task<ICachedData?> ReadAsync(string key);
+    Task<CachedData?> ReadAsync(string key);
 
     /// <summary>
     /// WriteAsync
     /// </summary>
-    /// <param name="metadata"></param>
-    /// <param name="stream"></param>
-    /// <returns></returns>
-    Task WriteAsync(IMetadata metadata, Stream stream);
+    Task WriteAsync(Metadata metadata, Stream stream);
 }
diff --git a/src/ImageWizard.Core/Caches/ICleanupCache.cs b/src/ImageWizard.Core/Caches/ICleanupCache.cs
@@ -14,6 +14,5 @@ public interface ICleanupCache : ICache
     /// <summary>
     /// CleanupAsync
     /// </summary>
-    /// <returns></returns>
     Task CleanupAsync(CleanupReason reason, CancellationToken cancellationToken = default);
 }
diff --git a/src/ImageWizard.Core/Caches/ILastAccessCache.cs b/src/ImageWizard.Core/Caches/ILastAccessCache.cs
@@ -12,6 +12,5 @@ public interface ILastAccessCache : ICache
     /// <summary>
     /// SetLastAccessAsync
     /// </summary>
-    /// <returns></returns>
     Task SetLastAccessAsync(string key, DateTime dateTime);
 }
diff --git a/src/ImageWizard.Core/Caches/Key/SHA256CacheKey.cs b/src/ImageWizard.Core/Caches/Key/SHA256CacheKey.cs
@@ -2,27 +2,12 @@
 // https://github.com/usercode/ImageWizard
 // MIT License
 
-using System.Security.Cryptography;
-using System.Text;
-
 namespace ImageWizard.Caches;
 
 public class SHA256CacheKey : ICacheKey
 {
     public string Create(string input)
     {
-        int inputLength = Encoding.UTF8.GetByteCount(input);
-
-        Span<byte> inputBuffer = inputLength <= 128 ? stackalloc byte[inputLength] : new byte[inputLength];
-
-        Encoding.UTF8.GetBytes(input, inputBuffer);
-
-        Span<byte> hashBuffer = stackalloc byte[32];
-
-        SHA256.HashData(inputBuffer, hashBuffer);
-
-        string key = Convert.ToHexString(hashBuffer);
-
-        return key;
+        return input.CreateSHA256Hash();
     }
 }
diff --git a/src/ImageWizard.Core/Caches/OneTimeCache.cs b/src/ImageWizard.Core/Caches/OneTimeCache.cs
@@ -9,10 +9,10 @@ namespace ImageWizard.Caches;
 /// </summary>
 class OneTimeCache : ICache
 {
-    private IMetadata? _metadata;
+    private Metadata? _metadata;
     private byte[] _data = [];
 
-    public async Task<ICachedData?> ReadAsync(string key)
+    public async Task<CachedData?> ReadAsync(string key)
     {
         if (_metadata == null)
         {
@@ -27,7 +27,7 @@ class OneTimeCache : ICache
         return new CachedData(_metadata, () => Task.FromResult<Stream>(new MemoryStream(_data)));
     }
 
-    public async Task WriteAsync(IMetadata metadata, Stream stream)
+    public async Task WriteAsync(Metadata metadata, Stream stream)
     {
         _metadata = metadata;
 
diff --git a/src/ImageWizard.Core/Cleanup/CleanupReason.cs b/src/ImageWizard.Core/Cleanup/CleanupReason.cs
@@ -27,16 +27,12 @@ public abstract class CleanupReason
     /// <summary>
     /// CanUse
     /// </summary>
-    /// <param name="cache"></param>
-    /// <returns></returns>
     public virtual bool CanUse(ICache cache) => true;
 
     /// <summary>
     /// IsValid
     /// </summary>
-    /// <param name="cachedData"></param>
-    /// <returns></returns>
-    public bool IsValid<T>(T cachedData) where T : IMetadata
+    public bool IsValid<T>(T cachedData) where T : Metadata
     {
         if (_cache.TryGetValue(typeof(T), out object? result) == false)
         {
diff --git a/src/ImageWizard.Core/Extensions/StringExtensions.cs b/src/ImageWizard.Core/Extensions/StringExtensions.cs
@@ -0,0 +1,38 @@
+﻿// Copyright (c) usercode
+// https://github.com/usercode/ImageWizard
+// MIT License
+
+using System.Buffers;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace ImageWizard;
+
+public static class StringExtensions
+{
+    public static string CreateSHA256Hash(this string input)
+    {
+        int inputLength = Encoding.UTF8.GetByteCount(input);
+
+        byte[] inputBuffer = ArrayPool<byte>.Shared.Rent(inputLength);
+
+        try
+        {
+            Span<byte> inputBufferSpan = inputBuffer.AsSpan(0, inputLength);
+
+            Encoding.UTF8.GetBytes(input, inputBufferSpan);
+
+            Span<byte> hashBuffer = stackalloc byte[32];
+
+            SHA256.HashData(inputBufferSpan, hashBuffer);
+
+            string key = Convert.ToHexString(hashBuffer);
+
+            return key;
+        }
+        finally
+        {
+            ArrayPool<byte>.Shared.Return(inputBuffer);
+        }
+    }
+}
diff --git a/src/ImageWizard.Core/Loaders/Files/FileLoader.cs b/src/ImageWizard.Core/Loaders/Files/FileLoader.cs
@@ -38,7 +38,7 @@ public FileLoader(IOptions<FileLoaderOptions> options, IWebHostEnvironment hosti
     /// </summary>
     private IWebHostEnvironment HostingEnvironment { get; }
 
-    public override async Task<LoaderResult> GetAsync(string source, ICachedData? existingCachedImage)
+    public override async Task<LoaderResult> GetAsync(string source, CachedData? existingCachedImage)
     {
         IFileInfo fileInfo = FileProvider.GetFileInfo(source);
 
diff --git a/src/ImageWizard.Core/Loaders/Http/HttpLoaderBase.cs b/src/ImageWizard.Core/Loaders/Http/HttpLoaderBase.cs
@@ -49,7 +49,7 @@ public HttpLoaderBase(
     /// <summary>
     /// GetAsync
     /// </summary>
-    public override async Task<LoaderResult> GetAsync(string source, ICachedData? existingCachedData)
+    public override async Task<LoaderResult> GetAsync(string source, CachedData? existingCachedData)
     {
         Uri? url = await CreateRequestUrl(source);
 
diff --git a/src/ImageWizard.Core/Loaders/ILoader.cs b/src/ImageWizard.Core/Loaders/ILoader.cs
@@ -19,5 +19,5 @@ public interface ILoader
     /// <summary>
     /// GetAsync
     /// </summary>
-    Task<LoaderResult> GetAsync(string source, ICachedData? existingCachedData = null);
+    Task<LoaderResult> GetAsync(string source, CachedData? existingCachedData = null);
 }
diff --git a/src/ImageWizard.Core/Loaders/Loader.cs b/src/ImageWizard.Core/Loaders/Loader.cs
@@ -25,5 +25,5 @@ public Loader(IOptions<TOptions> options)
 
     IOptions<LoaderOptions> ILoader.Options => Options;
 
-    public abstract Task<LoaderResult> GetAsync(string source, ICachedData? existingCachedData);
+    public abstract Task<LoaderResult> GetAsync(string source, CachedData? existingCachedData);
 }
diff --git a/src/ImageWizard.Core/Loaders/Youtube/YoutubeLoader.cs b/src/ImageWizard.Core/Loaders/Youtube/YoutubeLoader.cs
@@ -26,7 +26,7 @@ public YouTubeLoader(
         return ValueTask.FromResult<Uri?>(new Uri(source));
     }
 
-    public override async Task<LoaderResult> GetAsync(string source, ICachedData? existingCachedData)
+    public override async Task<LoaderResult> GetAsync(string source, CachedData? existingCachedData)
     {
         string[] quality = [
                             "maxresdefault.jpg", //1920 x 1080   
diff --git a/src/ImageWizard.Core/Middlewares/ImageWizardApi.cs b/src/ImageWizard.Core/Middlewares/ImageWizardApi.cs
@@ -163,7 +163,7 @@ public static async Task ExecuteAsync(
         string key = cacheKey.Create(pathBuilder.ToString());
 
         bool createCachedData = true;
-        ICachedData? cachedData;
+        CachedData? cachedData;
 
         //create reader lock
         using (await cacheLock.ReaderLockAsync(key))
@@ -194,7 +194,7 @@ public static async Task ExecuteAsync(
             using var w = await cacheLock.WriterLockAsync(key);
 
             //read cached data again
-            ICachedData? cachedDataAfterWriteLock = await cache.ReadAsync(key);
+            CachedData? cachedDataAfterWriteLock = await cache.ReadAsync(key);
 
             //cached data hasn't changed after writer lock?
             if (cachedDataAfterWriteLock == null || cachedData?.Metadata.Hash == cachedDataAfterWriteLock.Metadata.Hash)
diff --git a/src/ImageWizard.Core/Middlewares/ImageWizardOptions.cs b/src/ImageWizard.Core/Middlewares/ImageWizardOptions.cs
@@ -6,7 +6,7 @@
 
 namespace ImageWizard;
 
-public delegate ICachedData? FallbackHandler(LoaderResultState state, ImageWizardUrl url, ICachedData? existingCachedData);
+public delegate CachedData? FallbackHandler(LoaderResultState state, ImageWizardUrl url, CachedData? existingCachedData);
 
 /// <summary>
 /// ImageWizardOptions
diff --git a/src/ImageWizard.Core/Middlewares/Interceptors/IImageWizardInterceptor.cs b/src/ImageWizard.Core/Middlewares/Interceptors/IImageWizardInterceptor.cs
@@ -6,11 +6,11 @@ namespace ImageWizard;
 
 public interface IImageWizardInterceptor
 {
-    void OnCachedDataSent(ICachedData cachedData, bool notModified);
+    void OnCachedDataSent(CachedData cachedData, bool notModified);
 
-    void OnCachedDataCreated(ICachedData cachedData);
+    void OnCachedDataCreated(CachedData cachedData);
 
-    void OnCachedDataDeleted(ICachedData cachedData);
+    void OnCachedDataDeleted(CachedData cachedData);
 
     void OnValidSignature(ImageWizardUrl url);
 
diff --git a/src/ImageWizard.Core/Middlewares/Interceptors/InterceptorInvoker.cs b/src/ImageWizard.Core/Middlewares/Interceptors/InterceptorInvoker.cs
@@ -21,17 +21,17 @@ public InterceptorInvoker(IEnumerable<IImageWizardInterceptor> items)
     /// </summary>
     private IEnumerable<IImageWizardInterceptor> Items { get; }
 
-    public void OnCachedDataCreated(ICachedData cachedData)
+    public void OnCachedDataCreated(CachedData cachedData)
     {
         Items.Foreach(x => x.OnCachedDataCreated(cachedData));
     }
 
-    public void OnCachedDataDeleted(ICachedData cachedData)
+    public void OnCachedDataDeleted(CachedData cachedData)
     {
         Items.Foreach(x => x.OnCachedDataDeleted(cachedData));
     }
 
-    public void OnCachedDataSent(ICachedData cachedData, bool notModified)
+    public void OnCachedDataSent(CachedData cachedData, bool notModified)
     {
         Items.Foreach(x => x.OnCachedDataSent(cachedData, notModified));
     }
diff --git a/src/ImageWizard.Core/Types/CachedData.cs b/src/ImageWizard.Core/Types/CachedData.cs
diff --git a/src/ImageWizard.Core/Types/ICachedData.cs b/src/ImageWizard.Core/Types/ICachedData.cs
diff --git a/src/ImageWizard.Core/Utils/HttpClientExtensions.cs b/src/ImageWizard.Core/Utils/HttpClientExtensions.cs
diff --git a/src/ImageWizard.ImageSharp/Loaders/Placeholder/PlaceholderLoader.cs b/src/ImageWizard.ImageSharp/Loaders/Placeholder/PlaceholderLoader.cs
diff --git a/src/ImageWizard.MongoDB/Caches/MongoDBCache.cs b/src/ImageWizard.MongoDB/Caches/MongoDBCache.cs
diff --git a/src/ImageWizard.MongoDB/Extensions/MetadataExtensions.cs b/src/ImageWizard.MongoDB/Extensions/MetadataExtensions.cs
diff --git a/src/ImageWizard.Playwright/Loaders/ScreenshotLoader.cs b/src/ImageWizard.Playwright/Loaders/ScreenshotLoader.cs
diff --git a/src/ImageWizard.PuppeteerSharp/Loaders/ScreenshotLoader.cs b/src/ImageWizard.PuppeteerSharp/Loaders/ScreenshotLoader.cs
diff --git a/src/ImageWizard/Dockerfile b/src/ImageWizard/Dockerfile
diff --git a/src/ImageWizard/Dockerfile.original b/src/ImageWizard/Dockerfile.original
diff --git a/src/ImageWizard/Dockerfile1.original b/src/ImageWizard/Dockerfile1.original

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public AwsLoader(IOptions<AwsOptions> options)`
`25`	`25`	`/// </summary>`
`26`	`26`	`public IAmazonS3 Client { get; }`
`27`	`27`
`28`		`- public override async Task<LoaderResult> GetAsync(string source, ICachedData? existingCachedImage)`
	`28`	`+ public override async Task<LoaderResult> GetAsync(string source, CachedData? existingCachedImage)`
`29`	`29`	`{`
`30`	`30`	`GetObjectRequest request = new GetObjectRequest()`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private void SetData(string? mimeType, Action<AnalyticsDataItem> action)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- public void OnCachedDataSent(ICachedData cachedData, bool notModified)`
	`45`	`+ public void OnCachedDataSent(CachedData cachedData, bool notModified)`
`46`	`46`	`{`
`47`	`47`	`SetData(cachedData.Metadata.MimeType, x =>`
`48`	`48`	`{`
`@@ -59,7 +59,7 @@ public void OnCachedDataSent(ICachedData cachedData, bool notModified)`
`59`	`59`	`});`
`60`	`60`	`}`
`61`	`61`
`62`		`- public void OnCachedDataCreated(ICachedData cachedData)`
	`62`	`+ public void OnCachedDataCreated(CachedData cachedData)`
`63`	`63`	`{`
`64`	`64`	`SetData(cachedData.Metadata.MimeType, x =>`
`65`	`65`	`{`
`@@ -85,7 +85,7 @@ public void OnInvalidSignature(ImageWizardUrl url)`
`85`	`85`	`});`
`86`	`86`	`}`
`87`	`87`
`88`		`- public void OnCachedDataDeleted(ICachedData cachedData)`
	`88`	`+ public void OnCachedDataDeleted(CachedData cachedData)`
`89`	`89`	`{`
`90`	`90`	`SetData(cachedData.Metadata.MimeType, x =>`
`91`	`91`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public AzureBlobLoader(IOptions<AzureBlobOptions> options)`
`23`	`23`
`24`	`24`	`private BlobContainerClient Client { get; }`
`25`	`25`
`26`		`- public override async Task<LoaderResult> GetAsync(string source, ICachedData existingCachedImage)`
	`26`	`+ public override async Task<LoaderResult> GetAsync(string source, CachedData existingCachedImage)`
`27`	`27`	`{`
`28`	`28`	`BlobClient blob = Client.GetBlobClient(source);`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private static string GetMetaKey(string key)`
`35`	`35`	`return $"{KeyPrefix}_{key}_meta";`
`36`	`36`	`}`
`37`	`37`
`38`		`- public async Task<ICachedData?> ReadAsync(string key)`
	`38`	`+ public async Task<CachedData?> ReadAsync(string key)`
`39`	`39`	`{`
`40`	`40`	`byte[]? json = await Cache.GetAsync(GetMetaKey(key));`
`41`	`41`
`@@ -64,7 +64,7 @@ private static string GetMetaKey(string key)`
`64`	`64`	`});`
`65`	`65`	`}`
`66`	`66`
`67`		`- public async Task WriteAsync(IMetadata metadata, Stream stream)`
	`67`	`+ public async Task WriteAsync(Metadata metadata, Stream stream)`
`68`	`68`	`{`
`69`	`69`	`byte[] json = JsonSerializer.SerializeToUtf8Bytes(metadata, ImageWizardJsonSerializerContext.Default.Metadata);`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected FileInfo GetFileInfo(FileType type, string key)`
`73`	`73`	`return new FileInfo(file);`
`74`	`74`	`}`
`75`	`75`
`76`		`- public virtual async Task<ICachedData?> ReadAsync(string key)`
	`76`	`+ public virtual async Task<CachedData?> ReadAsync(string key)`
`77`	`77`	`{`
`78`	`78`	`Metadata? metadata = await ReadMetadataAsync(key);`
`79`	`79`
`@@ -92,7 +92,7 @@ protected FileInfo GetFileInfo(FileType type, string key)`
`92`	`92`	`return new CachedData(metadata, () => Task.FromResult<Stream>(blobFile.OpenRead()));`
`93`	`93`	`}`
`94`	`94`
`95`		`- public virtual async Task WriteAsync(IMetadata metadata, Stream stream)`
	`95`	`+ public virtual async Task WriteAsync(Metadata metadata, Stream stream)`
`96`	`96`	`{`
`97`	`97`	`await WriteMetadataAsync(metadata);`
`98`	`98`
`@@ -130,15 +130,15 @@ public virtual async Task WriteAsync(IMetadata metadata, Stream stream)`
`130`	`130`
`131`	`131`	`return metadata;`
`132`	`132`	`}`
`133`		`- catch(Exception ex)`
	`133`	`+ catch (Exception ex)`
`134`	`134`	`{`
`135`	`135`	`Logger.LogWarning(ex, $"Reading metadata is failed for key \"{key}\"");`
`136`	`136`
`137`		`- return null; //simulate "not found".to recreate a new cached data.`
	`137`	`+ return null; //simulate "not found" to recreate a new cached data.`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`		`- private async Task WriteMetadataAsync(IMetadata metadata)`
	`141`	`+ private async Task WriteMetadataAsync(Metadata metadata)`
`142`	`142`	`{`
`143`	`143`	`FileInfo metaFile = GetFileInfo(FileType.Meta, metadata.Key);`
`144`	`144`
`@@ -156,7 +156,7 @@ private async Task WriteMetadataAsync(IMetadata metadata)`
`156`	`156`	`await JsonSerializer.SerializeAsync(metadataStream, metadata, ImageWizardJsonSerializerContext.Default.Metadata);`
`157`	`157`	`}`
`158`	`158`
`159`		`- private void Delete(IMetadata metadata)`
	`159`	`+ private void Delete(Metadata metadata)`
`160`	`160`	`{`
`161`	`161`	`FileInfo metaFile = GetFileInfo(FileType.Meta, metadata.Key);`
`162`	`162`	`FileInfo blobFile = GetFileInfo(FileType.Blob, metadata.Key);`
`@@ -227,7 +227,7 @@ public virtual async Task CleanupAsync(CleanupReason reason, CancellationToken c`
`227`	`227`	`using var w = await CacheLock.WriterLockAsync(key);`
`228`	`228`
`229`	`229`	`//read metadata`
`230`		`- IMetadata? metadata = await ReadMetadataAsync(key);`
	`230`	`+ Metadata? metadata = await ReadMetadataAsync(key);`
`231`	`231`
`232`	`232`	`if (metadata != null)`
`233`	`233`	`{`
`@@ -248,7 +248,7 @@ public virtual async Task CleanupAsync(CleanupReason reason, CancellationToken c`
`248`	`248`
`249`	`249`	`public async Task SetLastAccessAsync(string key, DateTime dateTime)`
`250`	`250`	`{`
`251`		`- IMetadata? metadata = await ReadMetadataAsync(key);`
	`251`	`+ Metadata? metadata = await ReadMetadataAsync(key);`
`252`	`252`
`253`	`253`	`if (metadata == null)`
`254`	`254`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,5 @@ public interface ICleanupCache : ICache`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// CleanupAsync`
`16`	`16`	`/// </summary>`
`17`		`- /// <returns></returns>`
`18`	`17`	`Task CleanupAsync(CleanupReason reason, CancellationToken cancellationToken = default);`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@ public interface ILastAccessCache : ICache`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// SetLastAccessAsync`
`14`	`14`	`/// </summary>`
`15`		`- /// <returns></returns>`
`16`	`15`	`Task SetLastAccessAsync(string key, DateTime dateTime);`
`17`	`16`	`}`