Remove usage of IFileProvider in IImageProvider

Author: ronaldbarendse

src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs

@@ -7,7 +7,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Resolvers;
 
@@ -19,9 +18,9 @@ namespace SixLabors.ImageSharp.Web.Providers
     public class PhysicalFileSystemProvider : IImageProvider
     {
         /// <summary>
-        /// The file provider abstraction.
+        /// The root path for the provider.
         /// </summary>
-        private readonly IFileProvider fileProvider;
+        private readonly string providerRootPath;
 
         /// <summary>
         /// Contains various format helper methods based on the current configuration.
@@ -44,18 +43,12 @@ public PhysicalFileSystemProvider(
             FormatUtilities formatUtilities)
         {
             Guard.NotNull(environment, nameof(environment));
-
-            // ContentRootPath is never null.
-            // https://github.com/dotnet/aspnetcore/blob/b89eba6c3cda331ee98063e3c4a04267ec540315/src/Hosting/Hosting/src/WebHostBuilder.cs#L262
             Guard.NotNullOrWhiteSpace(environment.WebRootPath, nameof(environment.WebRootPath));
 
             // Allow configuration of the provider without having to register everything
             PhysicalFileSystemProviderOptions providerOptions = options != null ? options.Value : new();
-            string providerRootPath = GetProviderRoot(providerOptions, environment.WebRootPath, environment.ContentRootPath);
+            this.providerRootPath = GetProviderRoot(providerOptions, environment.WebRootPath, environment.ContentRootPath);
 
-            // Ensure provider directory is created before initializing the file provider
-            Directory.CreateDirectory(providerRootPath);
-            this.fileProvider = new PhysicalFileProvider(providerRootPath);
             this.formatUtilities = formatUtilities;
         }
 
@@ -72,16 +65,16 @@ public bool IsValidRequest(HttpContext context)
         /// <inheritdoc/>
         public Task<IImageResolver> GetAsync(HttpContext context)
         {
-            // Path has already been correctly parsed before here.
-            IFileInfo fileInfo = this.fileProvider.GetFileInfo(context.Request.Path.Value);
+            string path = Path.Join(this.providerRootPath, context.Request.Path.Value);
 
-            // Check to see if the file exists.
+            // Check to see if the file exists
+            var fileInfo = new FileInfo(path);
             if (!fileInfo.Exists)
             {
                 return Task.FromResult<IImageResolver>(null);
             }
 
-            var metadata = new ImageMetadata(fileInfo.LastModified.UtcDateTime, fileInfo.Length);
+            var metadata = new ImageMetadata(fileInfo.LastWriteTimeUtc, fileInfo.Length);
             return Task.FromResult<IImageResolver>(new PhysicalFileSystemResolver(fileInfo, metadata));
         }
 

src/ImageSharp.Web/Resolvers/PhysicalFileSystemResolver.cs

@@ -1,9 +1,8 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.Extensions.FileProviders;
 
 namespace SixLabors.ImageSharp.Web.Resolvers
 {
@@ -12,15 +11,15 @@ namespace SixLabors.ImageSharp.Web.Resolvers
     /// </summary>
     public class PhysicalFileSystemResolver : IImageResolver
     {
-        private readonly IFileInfo fileInfo;
+        private readonly FileInfo fileInfo;
         private readonly ImageMetadata metadata;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PhysicalFileSystemResolver"/> class.
         /// </summary>
         /// <param name="fileInfo">The input file info.</param>
         /// <param name="metadata">The image metadata associated with this file.</param>
-        public PhysicalFileSystemResolver(IFileInfo fileInfo, in ImageMetadata metadata)
+        public PhysicalFileSystemResolver(FileInfo fileInfo, in ImageMetadata metadata)
         {
             this.fileInfo = fileInfo;
             this.metadata = metadata;
@@ -30,6 +29,6 @@ public PhysicalFileSystemResolver(IFileInfo fileInfo, in ImageMetadata metadata)
         public Task<ImageMetadata> GetMetaDataAsync() => Task.FromResult(this.metadata);
 
         /// <inheritdoc/>
-        public Task<Stream> OpenReadAsync() => Task.FromResult(this.fileInfo.CreateReadStream());
+        public Task<Stream> OpenReadAsync() => Task.FromResult<Stream>(this.fileInfo.OpenRead());
     }
 }