Merge pull request #18 from umbraco/bugfix/keep-physicalfilesystemprovider

Add AzureBlobFileSystemImageProvider as first provider and only match configured root path

Author: rasmusjp

src/Umbraco.StorageProviders.AzureBlob/DependencyInjection/AzureBlobMediaFileSystemExtensions.cs

@@ -44,7 +44,7 @@ public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder b
             builder.Services.TryAddSingleton<AzureBlobFileSystemMiddleware>();
 
             // ImageSharp image provider/cache
-            builder.Services.AddUnique<IImageProvider, AzureBlobFileSystemImageProvider>();
+            builder.Services.Insert(0, ServiceDescriptor.Singleton<IImageProvider, AzureBlobFileSystemImageProvider>());
             builder.Services.AddUnique<IImageCache, AzureBlobFileSystemImageCache>();
 
             builder.SetMediaFileSystem(provider => provider.GetRequiredService<IAzureBlobFileSystemProvider>()

src/Umbraco.StorageProviders.AzureBlob/Imaging/AzureBlobFileSystemImageProvider.cs

@@ -20,6 +20,11 @@ public class AzureBlobFileSystemImageProvider : IImageProvider
         private string _rootPath;
         private readonly FormatUtilities _formatUtilities;
 
+        /// <summary>
+        /// A match function used by the resolver to identify itself as the correct resolver to use.
+        /// </summary>
+        private Func<HttpContext, bool>? _match;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AzureBlobFileSystemImageProvider" /> class.
         /// </summary>
@@ -68,8 +73,7 @@ public bool IsValidRequest(HttpContext context)
         {
             if (context == null) throw new ArgumentNullException(nameof(context));
 
-            return context.Request.Path.StartsWithSegments(_rootPath, StringComparison.InvariantCultureIgnoreCase)
-                   && _formatUtilities.GetExtensionFromUri(context.Request.GetDisplayUrl()) != null;
+            return _formatUtilities.GetExtensionFromUri(context.Request.GetDisplayUrl()) != null;
         }
 
         /// <inheritdoc />
@@ -95,8 +99,19 @@ public bool IsValidRequest(HttpContext context)
         /// <inheritdoc />
         public ProcessingBehavior ProcessingBehavior => ProcessingBehavior.CommandOnly;
 
-        /// <inheritdoc />
-        public Func<HttpContext, bool> Match { get; set; } = _ => true;
+        /// <inheritdoc/>
+        public Func<HttpContext, bool> Match
+        {
+            get => this._match ?? IsMatch;
+            set => this._match = value;
+        }
+
+        private bool IsMatch(HttpContext context)
+        {
+            if (context == null) throw new ArgumentNullException(nameof(context));
+
+            return context.Request.Path.StartsWithSegments(_rootPath, StringComparison.InvariantCultureIgnoreCase);
+        }
 
         private void OptionsOnChange(AzureBlobFileSystemOptions options, string name, IHostingEnvironment hostingEnvironment)
         {