Use AzureBlobFileSystemOptions.ContainerRootPath as fallback in AzureBlobFileSystemImageCache

Author: ronaldbarendse

src/Umbraco.StorageProviders.AzureBlob.ImageSharp/AzureBlobFileSystemImageCache.cs

@@ -15,15 +15,15 @@ namespace Umbraco.StorageProviders.AzureBlob.ImageSharp;
 /// </summary>
 public sealed class AzureBlobFileSystemImageCache : IImageCache
 {
-    private readonly string? _containerRootPath;
     private BlobContainerClient _container;
+    private string? _containerRootPath;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AzureBlobFileSystemImageCache" /> class.
     /// </summary>
     /// <param name="options">The options.</param>
     /// <param name="name">The name.</param>
-    /// <param name="containerRootPath">The container root path.</param>
+    /// <param name="containerRootPath">The container root path (will use <see cref="AzureBlobFileSystemOptions.ContainerRootPath" /> if <c>null</c>).</param>
     /// <exception cref="ArgumentNullException"><paramref name="options" /> is <c>null</c>.</exception>
     public AzureBlobFileSystemImageCache(IOptionsMonitor<AzureBlobFileSystemOptions> options, string name, string? containerRootPath)
     {
@@ -32,19 +32,16 @@ public AzureBlobFileSystemImageCache(IOptionsMonitor<AzureBlobFileSystemOptions>
 
         var fileSystemOptions = options.Get(name);
         _container = new BlobContainerClient(fileSystemOptions.ConnectionString, fileSystemOptions.ContainerName);
+        _containerRootPath = GetContainerRootPath(containerRootPath, fileSystemOptions);
 
         options.OnChange((options, changedName) =>
         {
             if (changedName == name)
             {
                 _container = new BlobContainerClient(options.ConnectionString, options.ContainerName);
+                _containerRootPath = GetContainerRootPath(containerRootPath, options);
             }
         });
-
-        if (!string.IsNullOrEmpty(containerRootPath))
-        {
-            _containerRootPath = containerRootPath.EnsureEndsWith('/');
-        }
     }
 
     /// <summary>
@@ -56,11 +53,14 @@ public AzureBlobFileSystemImageCache(IOptionsMonitor<AzureBlobFileSystemOptions>
     public AzureBlobFileSystemImageCache(BlobContainerClient blobContainerClient, string? containerRootPath)
     {
         _container = blobContainerClient ?? throw new ArgumentNullException(nameof(blobContainerClient));
+        _containerRootPath = GetContainerRootPath(containerRootPath);
+    }
 
-        if (!string.IsNullOrEmpty(containerRootPath))
-        {
-            _containerRootPath = containerRootPath.EnsureEndsWith('/');
-        }
+    private static string? GetContainerRootPath(string? containerRootPath, AzureBlobFileSystemOptions? options = null)
+    {
+        var path = containerRootPath ?? options?.ContainerRootPath;
+
+        return string.IsNullOrEmpty(path) ? null : path.EnsureEndsWith('/');
     }
 
     /// <inheritdoc />

src/Umbraco.StorageProviders.AzureBlob.ImageSharp/DependencyInjection/AddAzureBlobImageSharpCacheExtensions.cs

@@ -30,7 +30,7 @@ public static IUmbracoBuilder AddAzureBlobImageSharpCache(this IUmbracoBuilder b
     /// </summary>
     /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
     /// <param name="name">The name of the file system.</param>
-    /// <param name="containerRootPath">The container root path.</param>
+    /// <param name="containerRootPath">The container root path (will use <see cref="AzureBlobFileSystemOptions.ContainerRootPath" /> if <c>null</c>).</param>
     /// <returns>
     /// The <see cref="IUmbracoBuilder" />.
     /// </returns>
@@ -43,7 +43,7 @@ public static IUmbracoBuilder AddAzureBlobImageSharpCache(this IUmbracoBuilder b
     /// </summary>
     /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
     /// <param name="name">The name of the file system.</param>
-    /// <param name="containerRootPath">The container root path.</param>
+    /// <param name="containerRootPath">The container root path (will use <see cref="AzureBlobFileSystemOptions.ContainerRootPath" /> if <c>null</c>).</param>
     /// <returns>
     /// The <see cref="IUmbracoBuilder" />.
     /// </returns>