Merge branch 'develop-version-3' into main-version-3

Author: Jeavon

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -814,15 +814,15 @@ public BlobClient GetBlockBlobReference(string path)
         {
             Current.Logger.Debug<AzureBlobFileSystem>($"GetBlockBlobReference(path) method executed with path:{path}");
 
-            string blobPath = this.FixPath(path);
-
             // Only make the request if there is an actual path. See issue 8.
             // https://github.com/JimBobSquarePants/UmbracoFileSystemProviders.Azure/issues/8
             if (string.IsNullOrWhiteSpace(path))
             {
                 return null;
             }
 
+            string blobPath = this.FixPath(path);
+
             try
             {
                 return this.cloudBlobContainer.GetBlobClient(blobPath);

src/UmbracoFileSystemProviders.Azure/FileSystemVirtualFile.cs

@@ -9,14 +9,18 @@ namespace Our.Umbraco.FileSystemProviders.Azure
     using System.IO;
     using System.Web;
     using System.Web.Hosting;
-    using global::Umbraco.Core.Composing;
     using global::Umbraco.Core.IO;
 
     /// <summary>
     /// Represents a file object in a virtual file.
     /// </summary>
     internal class FileSystemVirtualFile : VirtualFile
     {
+        /// <summary>
+        /// The file system.
+        /// </summary>
+        private readonly IFileSystem fileSystem;
+
         /// <summary>
         /// The stream function delegate.
         /// </summary>
@@ -40,7 +44,9 @@ public FileSystemVirtualFile(string virtualPath, Lazy<IFileSystem> fileSystem, s
                 throw new ArgumentNullException(nameof(fileSystem));
             }
 
-            this.stream = () => fileSystem.Value.OpenFile(fileSystemPath);
+            this.fileSystem = fileSystem.Value;
+
+            this.stream = () => this.fileSystem.OpenFile(fileSystemPath);
         }
 
         /// <summary>
@@ -69,14 +75,19 @@ public override Stream Open()
                 // Add Accept-Ranges header to fix videos not playing on Safari
                 HttpContext.Current.Response.AppendHeader("Accept-Ranges", "bytes");
 
-                IFileSystem azureBlobFileSystem = Current.MediaFileSystem.Unwrap();
-                int maxDays = ((AzureBlobFileSystem)azureBlobFileSystem).FileSystem.MaxDays;
+                var unwrappedFileSystem = this.fileSystem.Unwrap();
+                if (!(unwrappedFileSystem is AzureFileSystem azureFileSystem))
+                {
+                    azureFileSystem = ((AzureBlobFileSystem)this.fileSystem).FileSystem;
+                }
 
+                int maxDays = azureFileSystem.MaxDays;
                 cache.SetExpires(DateTime.Now.ToUniversalTime().AddDays(maxDays));
                 cache.SetMaxAge(new TimeSpan(maxDays, 0, 0, 0));
                 cache.SetRevalidation(HttpCacheRevalidation.AllCaches);
-                cache.SetLastModified(azureBlobFileSystem.GetLastModified(VirtualPath).DateTime);
-                var etag = ((AzureBlobFileSystem)azureBlobFileSystem).FileSystem.GetETag(VirtualPath);
+                cache.SetLastModified(azureFileSystem.GetLastModified(VirtualPath).DateTime);
+
+                var etag = azureFileSystem.GetETag(VirtualPath);
                 if (!string.IsNullOrWhiteSpace(etag))
                 {
                     cache.SetETag(etag);