Merge pull request #188 from callumbwhyte/virtual-path-provider

Virtual Path Provider only works on media

Author: Jeavon

src/UmbracoFileSystemProviders.Azure.Media/AzureMediaFileSystemComponent.cs

@@ -4,12 +4,12 @@
 // </copyright>
 namespace Our.Umbraco.FileSystemProviders.Azure
 {
+    using System;
     using global:: Umbraco.Core.Composing;
     using global::Umbraco.Core.IO;
 
     public class AzureMediaFileSystemComponent : IComponent
     {
-
         private readonly SupportingFileSystems supportingFileSystems;
         private readonly AzureBlobFileSystemConfig config;
 
@@ -22,19 +22,14 @@ public AzureMediaFileSystemComponent(SupportingFileSystems supportingFileSystems
         public void Initialize()
         {
             var azureFs = this.supportingFileSystems.For<IMediaFileSystem>() as AzureBlobFileSystem;
+
             if (!this.config.DisableVirtualPathProvider && azureFs != null)
             {
                 AzureFileSystem azureFileSystem = azureFs.FileSystem;
 
-                // ReSharper disable once ConvertIfStatementToConditionalTernaryExpression
-                if (azureFileSystem.UseDefaultRoute)
-                {
-                    FileSystemVirtualPathProvider.ConfigureMedia(Constants.DefaultMediaRoute);
-                }
-                else
-                {
-                    FileSystemVirtualPathProvider.ConfigureMedia(azureFileSystem.ContainerName);
-                }
+                var route = azureFileSystem.UseDefaultRoute ? Constants.DefaultMediaRoute : azureFileSystem.ContainerName;
+
+                FileSystemVirtualPathProvider.Configure(route, new Lazy<IFileSystem>(() => azureFileSystem));
             }
         }
 

src/UmbracoFileSystemProviders.Azure.Media/FileSystemVirtualFile.cs renamed to src/UmbracoFileSystemProviders.Azure/FileSystemVirtualFile.cs

@@ -6,12 +6,10 @@
 namespace Our.Umbraco.FileSystemProviders.Azure
 {
     using System;
-    using System.Diagnostics.CodeAnalysis;
     using System.Reflection;
     using System.Web;
     using System.Web.Compilation;
     using System.Web.Hosting;
-    using global::Umbraco.Core.Composing;
     using global::Umbraco.Core.IO;
 
     /// <summary>
@@ -69,17 +67,19 @@ public FileSystemVirtualPathProvider(string pathPrefix, Lazy<IFileSystem> fileSy
         /// <param name="pathPrefix">
         /// The path prefix.
         /// </param>
+        /// <param name="fileSystem">
+        /// The file system.
+        /// </param>
         /// <exception cref="ArgumentNullException">
         /// Thrown if <paramref name="pathPrefix"/> is null.
         /// </exception>
-        public static void Configure(string pathPrefix = Constants.DefaultMediaRoute)
+        public static void Configure(string pathPrefix, Lazy<IFileSystem> fileSystem)
         {
             if (string.IsNullOrEmpty(pathPrefix))
             {
                 throw new ArgumentNullException(nameof(pathPrefix));
             }
 
-            Lazy<IFileSystem> fileSystem = new Lazy<IFileSystem>(() => Current.MediaFileSystem.Unwrap());
             FileSystemVirtualPathProvider provider = new FileSystemVirtualPathProvider(pathPrefix, fileSystem);
 
             // The standard HostingEnvironment.RegisterVirtualPathProvider(virtualPathProvider) method is ignored when
@@ -113,18 +113,6 @@ public static void Configure(string pathPrefix = Constants.DefaultMediaRoute)
             }
         }
 
-        /// <summary>
-        /// Configures the virtual path provider for media.
-        /// </summary>
-        /// <param name="pathPrefix">
-        /// The path prefix.
-        /// </param>
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1126:PrefixCallsCorrectly", Justification = "Resharper seems drunk.")]
-        public static void ConfigureMedia(string pathPrefix = Constants.DefaultMediaRoute)
-        {
-            Configure(pathPrefix);
-        }
-
         /// <summary>
         /// Gets a value that indicates whether a file exists in the virtual file system.
         /// </summary>
@@ -142,6 +130,7 @@ public override bool FileExists(string virtualPath)
             }
 
             string fileSystemPath = this.RemovePathPrefix(path);
+
             return this.fileSystem.Value.FileExists(fileSystemPath);
         }
 
@@ -156,6 +145,7 @@ public override bool FileExists(string virtualPath)
         public override VirtualFile GetFile(string virtualPath)
         {
             string path = this.FormatVirtualPath(virtualPath);
+
             if (!path.StartsWith(this.pathPrefix, StringComparison.InvariantCultureIgnoreCase))
             {
                 return base.GetFile(virtualPath);

src/UmbracoFileSystemProviders.Azure.Media/FileSystemVirtualPathProvider.cs renamed to src/UmbracoFileSystemProviders.Azure/FileSystemVirtualPathProvider.cs

@@ -305,6 +305,8 @@
     <Compile Include="AzureBlobFileSystemConfig.cs" />
     <Compile Include="AzureFileSystem.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="FileSystemVirtualFile.cs" />
+    <Compile Include="FileSystemVirtualPathProvider.cs" />
     <Compile Include="Helpers\ConfigurationHelper.cs" />
     <Compile Include="Helpers\IMimeTypeResolver.cs" />
     <Compile Include="Helpers\MimeTypeResolver.cs" />