Remove usage of IFileProvider in IImageCache

Author: ronaldbarendse

src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs

@@ -7,7 +7,6 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Resolvers;
 
@@ -28,11 +27,6 @@ public class PhysicalFileSystemCache : IImageCache
         /// </summary>
         private readonly int cacheFolderDepth;
 
-        /// <summary>
-        /// The file provider abstraction.
-        /// </summary>
-        private readonly IFileProvider fileProvider;
-
         /// <summary>
         /// Contains various format helper methods based on the current configuration.
         /// </summary>
@@ -54,18 +48,13 @@ public PhysicalFileSystemCache(
             FormatUtilities formatUtilities)
         {
             Guard.NotNull(environment, nameof(environment));
-            Guard.NotNull(options, nameof(options));
             Guard.NotNullOrWhiteSpace(environment.WebRootPath, nameof(environment.WebRootPath));
 
             // Allow configuration of the cache without having to register everything
             PhysicalFileSystemCacheOptions cacheOptions = options != null ? options.Value : new();
             this.cacheRootPath = GetCacheRoot(cacheOptions, environment.WebRootPath, environment.ContentRootPath);
             this.cacheFolderDepth = (int)cacheOptions.CacheFolderDepth;
 
-            // Ensure cache directory is created before initializing the file provider
-            Directory.CreateDirectory(this.cacheRootPath);
-
-            this.fileProvider = new PhysicalFileProvider(this.cacheRootPath);
             this.formatUtilities = formatUtilities;
         }
 
@@ -92,7 +81,7 @@ public Task<IImageCacheResolver> GetAsync(string key)
         {
             string path = ToFilePath(key, this.cacheFolderDepth);
 
-            IFileInfo metaFileInfo = this.fileProvider.GetFileInfo(this.ToMetaDataFilePath(path));
+            var metaFileInfo = new FileInfo(this.ToMetaDataFilePath(path));
             if (!metaFileInfo.Exists)
             {
                 return Task.FromResult<IImageCacheResolver>(null);

…ching/PhysicalFileSystemCacheResolver.cs …lvers/PhysicalFileSystemCacheResolver.cssrc/ImageSharp.Web/Caching/PhysicalFileSystemCacheResolver.cs renamed to src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs src/ImageSharp.Web/Caching/PhysicalFileSystemCacheResolver.cs renamed to src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs

@@ -3,7 +3,6 @@
 
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.Extensions.FileProviders;
 using SixLabors.ImageSharp.Web.Caching;
 
 namespace SixLabors.ImageSharp.Web.Resolvers
@@ -13,7 +12,7 @@ namespace SixLabors.ImageSharp.Web.Resolvers
     /// </summary>
     public class PhysicalFileSystemCacheResolver : IImageCacheResolver
     {
-        private readonly IFileInfo metaFileInfo;
+        private readonly FileInfo metaFileInfo;
         private readonly FormatUtilities formatUtilities;
         private ImageCacheMetadata metadata;
 
@@ -24,7 +23,7 @@ public class PhysicalFileSystemCacheResolver : IImageCacheResolver
         /// <param name="formatUtilities">
         /// Contains various format helper methods based on the current configuration.
         /// </param>
-        public PhysicalFileSystemCacheResolver(IFileInfo metaFileInfo, FormatUtilities formatUtilities)
+        public PhysicalFileSystemCacheResolver(FileInfo metaFileInfo, FormatUtilities formatUtilities)
         {
             this.metaFileInfo = metaFileInfo;
             this.formatUtilities = formatUtilities;
@@ -33,7 +32,7 @@ public PhysicalFileSystemCacheResolver(IFileInfo metaFileInfo, FormatUtilities f
         /// <inheritdoc/>
         public async Task<ImageCacheMetadata> GetMetaDataAsync()
         {
-            using Stream stream = this.metaFileInfo.CreateReadStream();
+            using Stream stream = this.metaFileInfo.OpenRead();
             this.metadata = await ImageCacheMetadata.ReadAsync(stream);
             return this.metadata;
         }
@@ -42,7 +41,7 @@ public async Task<ImageCacheMetadata> GetMetaDataAsync()
         public Task<Stream> OpenReadAsync()
         {
             string path = Path.ChangeExtension(
-                this.metaFileInfo.PhysicalPath,
+                this.metaFileInfo.FullName,
                 this.formatUtilities.GetExtensionFromContentType(this.metadata.ContentType));
 
             return Task.FromResult<Stream>(File.OpenRead(path));