Allow independent container and path

JimBobSquarePants · JimBobSquarePants · commit eed94aef971e · 2016-03-17T18:35:36.000+11:00
Should allow for a different container name while still using media as
the route prefix.

Needs double checking.
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Controllers/Configure.js b/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Controllers/Configure.js
@@ -36,4 +36,8 @@ configApp.controller("Loader", function ($scope, $http, $log) {
     $scope.capitalizeFirstLetter = function (string) {
         return string.charAt(0).toUpperCase() + string.slice(1);
     }
+
+    $scope.getInputType = function (param) {
+        return param.toUpperCase() === "USEDEFAULTROUTE" ? "checkbox" : "text";
+    }
 });
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/Configure.ascx b/src/UmbracoFileSystemProviders.Azure.Installer/Configurator/Views/Configure.ascx
@@ -40,7 +40,7 @@
                                     <input 
                                         class ="input-block-level"
                                         dynamic-name="param.Key"
-                                        type="text"
+                                        type="{{ getInputType(param.Key) }}"
                                         ng-model="param.Value"                            
                                         required
                                     >
diff --git a/src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs b/src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs
@@ -62,16 +62,18 @@ public IEnumerable<Parameter> GetParameters()
         [HttpPost]
         public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)
         {
-            var connection = parameters.SingleOrDefault(k => k.Key == "connectionString").Value;
-            var containerName = parameters.SingleOrDefault(k => k.Key == "containerName").Value;
-            var rootUrl = parameters.SingleOrDefault(k => k.Key == "rootUrl").Value;
+            var newParameters = parameters as IList<Parameter> ?? parameters.ToList();
+            var connection = newParameters.SingleOrDefault(k => k.Key == "connectionString").Value;
+            var containerName = newParameters.SingleOrDefault(k => k.Key == "containerName").Value;
+            bool useDefaultRoute = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "useDefaultRoute").Value);
+            var rootUrl = newParameters.SingleOrDefault(k => k.Key == "rootUrl").Value;
 
             if (!TestAzureCredentials(connection, containerName))
             {
                 return InstallerStatus.ConnectionError;
             }
 
-            if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, parameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, containerName))
+            if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, newParameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, containerName))
             {
                 if (!ExecuteFileSystemConfigTransform() || !ExecuteWebConfigTransform())
                 {
@@ -85,7 +87,11 @@ public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)
                 else
                 {
                     // merge in storage url to ImageProcessor security.config xdt
-                    SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, containerName);
+                    string prefix = useDefaultRoute
+                                        ? Azure.Constants.DefaultMediaRoute
+                                        : containerName;
+
+                    SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, prefix, containerName);
 
                     // transform ImageProcessor security.config
                     if (ExecuteImageProcessorSecurityConfigTransform())
@@ -180,7 +186,10 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont
             nsMgr.AddNamespace("xdt", strNamespace);
 
             var locationElement = document.SelectSingleNode(string.Format("//location"));
-            if (locationElement != null) locationElement.Attributes["path"].Value = containerName;
+            if (locationElement != null)
+            {
+                locationElement.Attributes["path"].Value = containerName;
+            }
 
             try
             {
@@ -199,7 +208,7 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont
             return result;
         }
 
-        internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string containerName)
+        internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string prefix, string containerName)
         {
             var result = false;
 
@@ -214,7 +223,7 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str
 
             foreach (XmlElement service in rawServices)
             {
-                service.SetAttribute("prefix", $"{containerName}/");
+                service.SetAttribute("prefix", $"{prefix}/");
             }
 
             // Set the settings within the InsertIfMissing action
@@ -249,14 +258,14 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str
         internal static IEnumerable<Parameter> GetParametersFromXdt(string xdtPath, string configPath)
         {
             // For package upgrades check for configured values in existing FileSystemProviders.config and merge with the Parameters from the XDT file (there could be new ones)
-            var xdtParameters = GetParametersFromXml(xdtPath);
-            var currentConfigParameters = GetParametersFromXml(configPath);
+            List<Parameter> xdtParameters = GetParametersFromXml(xdtPath).ToList();
+            List<Parameter> currentConfigParameters = GetParametersFromXml(configPath).ToList();
 
-            foreach (var parameter in xdtParameters)
+            foreach (Parameter parameter in xdtParameters)
             {
                 if (currentConfigParameters.Select(k => k.Key).Contains(parameter.Key))
                 {
-                    var currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);
+                    Parameter currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);
                     if (currentParameter != null)
                     {
                         parameter.Value = currentParameter.Value;
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs b/src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs
@@ -45,7 +45,7 @@ public AzureBlobFileSystem CreateAzureBlobFileSystem(bool disableVirtualPathProv
             Mock<ILogHelper> logHelper = new Mock<ILogHelper>();
             Mock<IMimeTypeResolver> mimeTypeHelper = new Mock<IMimeTypeResolver>();
 
-            return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays)
+            return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays, true)
             {
                 FileSystem =
                 {
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.config.install.xdt b/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.config.install.xdt
@@ -8,7 +8,7 @@
   </Provider>
 
   <Provider alias="media" type="Our.Umbraco.FileSystemProviders.Azure.AzureBlobFileSystem, Our.Umbraco.FileSystemProviders.Azure" xdt:Locator="Match(type)" xdt:Transform="InsertIfMissing">
-      <Parameters xdt:Transform="InsertIfMissing">
+    <Parameters xdt:Transform="InsertIfMissing">
       <add key="containerName" value="media" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
       <add key="rootUrl" value="http://[myAccountName].blob.core.windows.net/" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
       <add key="connectionString" value="DefaultEndpointsProtocol=https;AccountName=[myAccountName];AccountKey=[myAccountKey]" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
@@ -17,6 +17,11 @@
         Defaults to 365 days.
       -->
       <add key="maxDays" value="365" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+      <!--
+        When true this allows the VirtualPathProvider to use the deafult "media" route prefix regardless 
+        of the container name.
+      -->
+      <add key="useDefaultRoute" value="true" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
     </Parameters>
   </Provider>
   <!--
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.upgrade.config b/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemProviders.upgrade.config
@@ -1,19 +1,24 @@
 ﻿<?xml version="1.0"?>
 <FileSystemProviders>
-  
+
   <!-- Media -->
   <Provider alias="media" type="Our.Umbraco.FileSystemProviders.Azure.AzureBlobFileSystem, Our.Umbraco.FileSystemProviders.Azure">
-  	<Parameters>
-  		<add key="containerName" value="media"/>
-  		<add key="rootUrl" value="http://existing123456789.blob.core.windows.net/"/>
-  		<add key="connectionString"
+    <Parameters>
+      <add key="containerName" value="media"/>
+      <add key="rootUrl" value="http://existing123456789.blob.core.windows.net/"/>
+      <add key="connectionString"
   			value="DefaultEndpointsProtocol=https;AccountName=existing123456789;AccountKey=existingKey"/>
-  		<!--
+      <!--
         Optional configuration value determining the maximum number of days to cache items in the browser.
         Defaults to 365 days.
       -->
-  		<add key="maxDays" value="365"/>
-  	</Parameters>
+      <add key="maxDays" value="365"/>
+      <!--
+        When true this allows the VirtualPathProvider to use the deafult "media" route prefix regardless 
+        of the container name.
+      -->
+      <add key="useDefaultRoute" value="true"/>
+    </Parameters>
   </Provider>
-   
+
 </FileSystemProviders>
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemVirtualPathProviderTests.cs b/src/UmbracoFileSystemProviders.Azure.Tests/FileSystemVirtualPathProviderTests.cs
@@ -36,8 +36,8 @@ public void FilePathPrefixFormatted()
         {
             // Arrange/Act
             Mock<IFileSystem> fileProvider = new Mock<IFileSystem>();
-            FileSystemVirtualPathProvider provider = new FileSystemVirtualPathProvider("media", new Lazy<IFileSystem>(() => fileProvider.Object));
-            
+            FileSystemVirtualPathProvider provider = new FileSystemVirtualPathProvider(Constants.DefaultMediaRoute, new Lazy<IFileSystem>(() => fileProvider.Object));
+
             // Assert
             Assert.AreEqual(provider.PathPrefix, "/media/");
         }
@@ -54,7 +54,7 @@ public void FilePathShouldBeExecuted()
 
             // Act
             VirtualFile result = provider.GetFile("~/media/1010/media.jpg");
-            
+
             // Assert
             Assert.IsNotNull(result);
         }
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/InstallerTests.cs b/src/UmbracoFileSystemProviders.Azure.Tests/InstallerTests.cs
@@ -25,7 +25,7 @@ public void CheckXdtFirstParameterKey()
         public void CheckXdtNumberOfParameters()
         {
             var parameters = InstallerController.GetParametersFromXml("FileSystemProviders.config.install.xdt");
-            Assert.AreEqual(4, parameters.Count());
+            Assert.AreEqual(5, parameters.Count());
         }
 
         [Test]
@@ -41,6 +41,5 @@ public void CheckNewInstallDefaultConfig()
             var parameters = InstallerController.GetParametersFromXdt("FileSystemProviders.config.install.xdt", "FileSystemProviders.default.config");
             Assert.AreEqual("http://[myAccountName].blob.core.windows.net/", parameters.Single(k => k.Key == "rootUrl").Value);
         }
-
     }
 }
diff --git a/src/UmbracoFileSystemProviders.Azure.Tests/stylecop.json b/src/UmbracoFileSystemProviders.Azure.Tests/stylecop.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
   "settings": {
     "documentationRules": {
-      "companyName": "James Jackson-South",
+      "companyName": "James Jackson-South and contributors",
       "copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the Apache License, Version 2.0."
     }    
   }
diff --git a/src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs
@@ -24,8 +24,8 @@ public class AzureBlobFileSystem : IFileSystem
         /// <param name="containerName">The container name.</param>
         /// <param name="rootUrl">The root url.</param>
         /// <param name="connectionString">The connection string.</param>
-        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString) :
-            this(containerName, rootUrl, connectionString, "365")
+        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString)
+            : this(containerName, rootUrl, connectionString, "365", true)
         {
         }
 
@@ -36,9 +36,10 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti
         /// <param name="rootUrl">The root url.</param>
         /// <param name="connectionString">The connection string.</param>
         /// <param name="maxDays">The maximum number of days to cache blob items for in the browser.</param>
-        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString, string maxDays)
+        /// <param name="useDefaultRoute">Whether to use the default "media" route in the url independent of the blob container.</param>
+        public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString, string maxDays, bool useDefaultRoute)
         {
-            this.FileSystem = AzureFileSystem.GetInstance(containerName, rootUrl, connectionString, maxDays);
+            this.FileSystem = AzureFileSystem.GetInstance(containerName, rootUrl, connectionString, maxDays, useDefaultRoute);
         }
 
         /// <summary>
diff --git a/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs b/src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
@@ -52,11 +52,6 @@ internal class AzureFileSystem : IFileSystem
         /// </summary>
         private static AzureFileSystem fileSystem;
 
-        /// <summary>
-        /// The container name.
-        /// </summary>
-        internal readonly string ContainerName;
-
         /// <summary>
         /// The root url.
         /// </summary>
@@ -74,10 +69,11 @@ internal class AzureFileSystem : IFileSystem
         /// <param name="rootUrl">The root url.</param>
         /// <param name="connectionString">The connection string.</param>
         /// <param name="maxDays">The maximum number of days to cache blob items for in the browser.</param>
+        /// <param name="useDefaultRoute">Whether to use the default "media" route in the url independent of the blob container.</param>
         /// <exception cref="ArgumentNullException">
         /// Thrown if <paramref name="containerName"/> is null or whitespace.
         /// </exception>
-        private AzureFileSystem(string containerName, string rootUrl, string connectionString, int maxDays)
+        private AzureFileSystem(string containerName, string rootUrl, string connectionString, int maxDays, bool useDefaultRoute)
         {
             if (string.IsNullOrWhiteSpace(containerName))
             {
@@ -114,6 +110,7 @@ private AzureFileSystem(string containerName, string rootUrl, string connectionS
             this.rootUrl = rootUrl + containerName + "/";
             this.ContainerName = containerName;
             this.MaxDays = maxDays;
+            this.UseDefaultRoute = useDefaultRoute;
 
             this.LogHelper = new WrappedLogHelper();
             this.MimeTypeResolver = new MimeTypeResolver();
@@ -135,9 +132,20 @@ private AzureFileSystem(string containerName, string rootUrl, string connectionS
         public bool DisableVirtualPathProvider { get; set; }
 
         /// <summary>
-        /// Gets or sets the maximum number of days to cache blob items for in the browser.
+        /// Gets the container name.
         /// </summary>
-        public int MaxDays { get; set; }
+        public string ContainerName { get; private set; }
+
+        /// <summary>
+        /// Gets the maximum number of days to cache blob items for in the browser.
+        /// </summary>
+        public int MaxDays { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating whether to use the default "media" route in the url
+        /// independent of the blob container.
+        /// </summary>
+        public bool UseDefaultRoute { get; private set; }
 
         /// <summary>
         /// Returns a singleton instance of the <see cref="AzureFileSystem"/> class.
@@ -146,8 +154,9 @@ private AzureFileSystem(string containerName, string rootUrl, string connectionS
         /// <param name="rootUrl">The root url.</param>
         /// <param name="connectionString">The connection string.</param>
         /// <param name="maxDays">The maximum number of days to cache blob items for in the browser.</param>
+        /// <param name="useDefaultRoute">Whether to use the default "media" route in the url independent of the blob container.</param>
         /// <returns>The <see cref="AzureFileSystem"/></returns>
-        public static AzureFileSystem GetInstance(string containerName, string rootUrl, string connectionString, string maxDays)
+        public static AzureFileSystem GetInstance(string containerName, string rootUrl, string connectionString, string maxDays, bool useDefaultRoute)
         {
             lock (Locker)
             {
@@ -159,7 +168,7 @@ public static AzureFileSystem GetInstance(string containerName, string rootUrl,
                         max = 365;
                     }
 
-                    fileSystem = new AzureFileSystem(containerName, rootUrl, connectionString, max);
+                    fileSystem = new AzureFileSystem(containerName, rootUrl, connectionString, max, useDefaultRoute);
                 }
 
                 return fileSystem;
@@ -224,6 +233,7 @@ public void AddFile(string path, Stream stream, bool overrideIfExists)
                 {
                     blockBlob.Metadata.Add("CreatedDate", created.ToString(CultureInfo.InvariantCulture));
                 }
+
                 blockBlob.SetMetadata();
             }
             catch (Exception ex)
@@ -280,7 +290,7 @@ public void DeleteDirectory(string path, bool recursive)
                 return;
             }
 
-            // Delete the directory. 
+            // Delete the directory.
             // Force recursive since Azure has no real concept of directories
             this.DeleteDirectory(path, true);
         }
@@ -594,6 +604,12 @@ private string FixPath(string path)
                 path = path.Substring(this.rootUrl.Length);
             }
 
+            // Strip default route
+            if (path.StartsWith(Constants.DefaultMediaRoute, StringComparison.InvariantCultureIgnoreCase))
+            {
+                path = path.Substring(Constants.DefaultMediaRoute.Length);
+            }
+
             // Strip container Prefix
             if (path.StartsWith(this.ContainerName, StringComparison.InvariantCultureIgnoreCase))
             {
diff --git a/src/UmbracoFileSystemProviders.Azure/Constants.cs b/src/UmbracoFileSystemProviders.Azure/Constants.cs
@@ -15,6 +15,11 @@ namespace Our.Umbraco.FileSystemProviders.Azure
     /// </summary>
     public static class Constants
     {
+        /// <summary>
+        /// The default route path for media objects.
+        /// </summary>
+        public const string DefaultMediaRoute = "media";
+
         /// <summary>
         /// The configuration setting constants.
         /// </summary>
diff --git a/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualFile.cs b/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualFile.cs
@@ -51,7 +51,7 @@ public FileSystemVirtualFile(string virtualPath, Lazy<IFileSystem> fileSystem, s
         /// Gets a value that indicates that this is a virtual resource that should be treated as a file.
         /// </summary>
         /// <returns>
-        /// Always false. 
+        /// Always false.
         /// </returns>
         public override bool IsDirectory
         {
diff --git a/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualPathProvider.cs b/src/UmbracoFileSystemProviders.Azure/FileSystemVirtualPathProvider.cs
@@ -81,7 +81,7 @@ public string PathPrefix
         /// <exception cref="ArgumentNullException">
         /// Thrown if <paramref name="pathPrefix"/> is null.
         /// </exception>
-        public static void Configure<TProviderTypeFilter>(string pathPrefix = "media") where TProviderTypeFilter : FileSystemWrapper
+        public static void Configure<TProviderTypeFilter>(string pathPrefix = Constants.DefaultMediaRoute) where TProviderTypeFilter : FileSystemWrapper
         {
             if (string.IsNullOrEmpty(pathPrefix))
             {
@@ -100,7 +100,7 @@ public static void Configure<TProviderTypeFilter>(string pathPrefix = "media") w
         /// The path prefix.
         /// </param>
         [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1126:PrefixCallsCorrectly", Justification = "Resharper seems drunk.")]
-        public static void ConfigureMedia(string pathPrefix = "media")
+        public static void ConfigureMedia(string pathPrefix = Constants.DefaultMediaRoute)
         {
             Configure<MediaFileSystem>(pathPrefix);
         }
@@ -145,7 +145,7 @@ public override VirtualFile GetFile(string virtualPath)
 
             return new FileSystemVirtualFile(virtualPath, this.fileSystem, fileSystemPath);
         }
-        
+
         /// <summary>
         /// Correctly formats the virtual path prefix.
         /// </summary>
diff --git a/src/UmbracoFileSystemProviders.Azure/VirtualPathProviderController.cs b/src/UmbracoFileSystemProviders.Azure/VirtualPathProviderController.cs

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,8 @@ configApp.controller("Loader", function ($scope, $http, $log) {`
`36`	`36`	`$scope.capitalizeFirstLetter = function (string) {`
`37`	`37`	`return string.charAt(0).toUpperCase() + string.slice(1);`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ $scope.getInputType = function (param) {`
	`41`	`+ return param.toUpperCase() === "USEDEFAULTROUTE" ? "checkbox" : "text";`
	`42`	`+ }`
`39`	`43`	`});`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`<input`
`41`	`41`	`class ="input-block-level"`
`42`	`42`	`dynamic-name="param.Key"`
`43`		`- type="text"`
	`43`	`+ type="{{ getInputType(param.Key) }}"`
`44`	`44`	`ng-model="param.Value"`
`45`	`45`	`required`
`46`	`46`	`>`
Original file line number	Diff line number	Diff line change
`@@ -62,16 +62,18 @@ public IEnumerable<Parameter> GetParameters()`
`62`	`62`	`[HttpPost]`
`63`	`63`	`public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)`
`64`	`64`	`{`
`65`		`- var connection = parameters.SingleOrDefault(k => k.Key == "connectionString").Value;`
`66`		`- var containerName = parameters.SingleOrDefault(k => k.Key == "containerName").Value;`
`67`		`- var rootUrl = parameters.SingleOrDefault(k => k.Key == "rootUrl").Value;`
	`65`	`+ var newParameters = parameters as IList<Parameter> ?? parameters.ToList();`
	`66`	`+ var connection = newParameters.SingleOrDefault(k => k.Key == "connectionString").Value;`
	`67`	`+ var containerName = newParameters.SingleOrDefault(k => k.Key == "containerName").Value;`
	`68`	`+ bool useDefaultRoute = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "useDefaultRoute").Value);`
	`69`	`+ var rootUrl = newParameters.SingleOrDefault(k => k.Key == "rootUrl").Value;`
`68`	`70`
`69`	`71`	`if (!TestAzureCredentials(connection, containerName))`
`70`	`72`	`{`
`71`	`73`	`return InstallerStatus.ConnectionError;`
`72`	`74`	`}`
`73`	`75`
`74`		`- if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, parameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, containerName))`
	`76`	`+ if (SaveParametersToFileSystemProvidersXdt(this.fileSystemProvidersConfigInstallXdtPath, newParameters) && SaveContainerNameToWebConfigXdt(this.webConfigXdtPath, containerName))`
`75`	`77`	`{`
`76`	`78`	`if (!ExecuteFileSystemConfigTransform() \|\| !ExecuteWebConfigTransform())`
`77`	`79`	`{`
`@@ -85,7 +87,11 @@ public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)`
`85`	`87`	`else`
`86`	`88`	`{`
`87`	`89`	`// merge in storage url to ImageProcessor security.config xdt`
`88`		`- SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, containerName);`
	`90`	`+ string prefix = useDefaultRoute`
	`91`	`+ ? Azure.Constants.DefaultMediaRoute`
	`92`	`+ : containerName;`
	`93`	`+`
	`94`	`+ SaveBlobPathToImageProcessorSecurityXdt(ImageProcessorSecurityInstallXdtPath, rootUrl, prefix, containerName);`
`89`	`95`
`90`	`96`	`// transform ImageProcessor security.config`
`91`	`97`	`if (ExecuteImageProcessorSecurityConfigTransform())`
`@@ -180,7 +186,10 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont`
`180`	`186`	`nsMgr.AddNamespace("xdt", strNamespace);`
`181`	`187`
`182`	`188`	`var locationElement = document.SelectSingleNode(string.Format("//location"));`
`183`		`- if (locationElement != null) locationElement.Attributes["path"].Value = containerName;`
	`189`	`+ if (locationElement != null)`
	`190`	`+ {`
	`191`	`+ locationElement.Attributes["path"].Value = containerName;`
	`192`	`+ }`
`184`	`193`
`185`	`194`	`try`
`186`	`195`	`{`
`@@ -199,7 +208,7 @@ internal static bool SaveContainerNameToWebConfigXdt(string xdtPath, string cont`
`199`	`208`	`return result;`
`200`	`209`	`}`
`201`	`210`
`202`		`- internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string containerName)`
	`211`	`+ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, string rootUrl, string prefix, string containerName)`
`203`	`212`	`{`
`204`	`213`	`var result = false;`
`205`	`214`
`@@ -214,7 +223,7 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str`
`214`	`223`
`215`	`224`	`foreach (XmlElement service in rawServices)`
`216`	`225`	`{`
`217`		`- service.SetAttribute("prefix", $"{containerName}/");`
	`226`	`+ service.SetAttribute("prefix", $"{prefix}/");`
`218`	`227`	`}`
`219`	`228`
`220`	`229`	`// Set the settings within the InsertIfMissing action`
`@@ -249,14 +258,14 @@ internal static bool SaveBlobPathToImageProcessorSecurityXdt(string xdtPath, str`
`249`	`258`	`internal static IEnumerable<Parameter> GetParametersFromXdt(string xdtPath, string configPath)`
`250`	`259`	`{`
`251`	`260`	`// For package upgrades check for configured values in existing FileSystemProviders.config and merge with the Parameters from the XDT file (there could be new ones)`
`252`		`- var xdtParameters = GetParametersFromXml(xdtPath);`
`253`		`- var currentConfigParameters = GetParametersFromXml(configPath);`
	`261`	`+ List<Parameter> xdtParameters = GetParametersFromXml(xdtPath).ToList();`
	`262`	`+ List<Parameter> currentConfigParameters = GetParametersFromXml(configPath).ToList();`
`254`	`263`
`255`		`- foreach (var parameter in xdtParameters)`
	`264`	`+ foreach (Parameter parameter in xdtParameters)`
`256`	`265`	`{`
`257`	`266`	`if (currentConfigParameters.Select(k => k.Key).Contains(parameter.Key))`
`258`	`267`	`{`
`259`		`- var currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);`
	`268`	`+ Parameter currentParameter = currentConfigParameters.SingleOrDefault(k => k.Key == parameter.Key);`
`260`	`269`	`if (currentParameter != null)`
`261`	`270`	`{`
`262`	`271`	`parameter.Value = currentParameter.Value;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public AzureBlobFileSystem CreateAzureBlobFileSystem(bool disableVirtualPathProv`
`45`	`45`	`Mock<ILogHelper> logHelper = new Mock<ILogHelper>();`
`46`	`46`	`Mock<IMimeTypeResolver> mimeTypeHelper = new Mock<IMimeTypeResolver>();`
`47`	`47`
`48`		`- return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays)`
	`48`	`+ return new AzureBlobFileSystem(containerName, rootUrl, connectionString, maxDays, true)`
`49`	`49`	`{`
`50`	`50`	`FileSystem =`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public void FilePathPrefixFormatted()`
`36`	`36`	`{`
`37`	`37`	`// Arrange/Act`
`38`	`38`	`Mock<IFileSystem> fileProvider = new Mock<IFileSystem>();`
`39`		`- FileSystemVirtualPathProvider provider = new FileSystemVirtualPathProvider("media", new Lazy<IFileSystem>(() => fileProvider.Object));`
`40`		`-`
	`39`	`+ FileSystemVirtualPathProvider provider = new FileSystemVirtualPathProvider(Constants.DefaultMediaRoute, new Lazy<IFileSystem>(() => fileProvider.Object));`
	`40`	`+`
`41`	`41`	`// Assert`
`42`	`42`	`Assert.AreEqual(provider.PathPrefix, "/media/");`
`43`	`43`	`}`
`@@ -54,7 +54,7 @@ public void FilePathShouldBeExecuted()`
`54`	`54`
`55`	`55`	`// Act`
`56`	`56`	`VirtualFile result = provider.GetFile("~/media/1010/media.jpg");`
`57`		`-`
	`57`	`+`
`58`	`58`	`// Assert`
`59`	`59`	`Assert.IsNotNull(result);`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void CheckXdtFirstParameterKey()`
`25`	`25`	`public void CheckXdtNumberOfParameters()`
`26`	`26`	`{`
`27`	`27`	`var parameters = InstallerController.GetParametersFromXml("FileSystemProviders.config.install.xdt");`
`28`		`- Assert.AreEqual(4, parameters.Count());`
	`28`	`+ Assert.AreEqual(5, parameters.Count());`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`[Test]`
`@@ -41,6 +41,5 @@ public void CheckNewInstallDefaultConfig()`
`41`	`41`	`var parameters = InstallerController.GetParametersFromXdt("FileSystemProviders.config.install.xdt", "FileSystemProviders.default.config");`
`42`	`42`	`Assert.AreEqual("http://[myAccountName].blob.core.windows.net/", parameters.Single(k => k.Key == "rootUrl").Value);`
`43`	`43`	`}`
`44`		`-`
`45`	`44`	`}`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",`
`3`	`3`	`"settings": {`
`4`	`4`	`"documentationRules": {`
`5`		`- "companyName": "James Jackson-South",`
	`5`	`+ "companyName": "James Jackson-South and contributors",`
`6`	`6`	`"copyrightText": "Copyright (c) {companyName}. All rights reserved.\nLicensed under the Apache License, Version 2.0."`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ public class AzureBlobFileSystem : IFileSystem`
`24`	`24`	`/// <param name="containerName">The container name.</param>`
`25`	`25`	`/// <param name="rootUrl">The root url.</param>`
`26`	`26`	`/// <param name="connectionString">The connection string.</param>`
`27`		`- public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString) :`
`28`		`- this(containerName, rootUrl, connectionString, "365")`
	`27`	`+ public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString)`
	`28`	`+ : this(containerName, rootUrl, connectionString, "365", true)`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
`@@ -36,9 +36,10 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti`
`36`	`36`	`/// <param name="rootUrl">The root url.</param>`
`37`	`37`	`/// <param name="connectionString">The connection string.</param>`
`38`	`38`	`/// <param name="maxDays">The maximum number of days to cache blob items for in the browser.</param>`
`39`		`- public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString, string maxDays)`
	`39`	`+ /// <param name="useDefaultRoute">Whether to use the default "media" route in the url independent of the blob container.</param>`
	`40`	`+ public AzureBlobFileSystem(string containerName, string rootUrl, string connectionString, string maxDays, bool useDefaultRoute)`
`40`	`41`	`{`
`41`		`- this.FileSystem = AzureFileSystem.GetInstance(containerName, rootUrl, connectionString, maxDays);`
	`42`	`+ this.FileSystem = AzureFileSystem.GetInstance(containerName, rootUrl, connectionString, maxDays, useDefaultRoute);`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`/// <summary>`