Merge pull request #7 from tomfulton/fix/delete-files

Fix issue where files do not get deleted after emptying recycle bin

Author: Jeavon

src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs

@@ -468,6 +468,7 @@ public void TestDeleteDirectoryPrefixed()
 
             // Assert
             Assert.IsTrue(provider.DirectoryExists("media/1010/"));
+            Assert.IsTrue(provider.FileExists("media/1010/media.jpg"));
 
             // Act
             provider.DeleteDirectory("media/1010/");
@@ -476,5 +477,25 @@ public void TestDeleteDirectoryPrefixed()
             Assert.IsFalse(provider.DirectoryExists("media/1010/"));
             Assert.IsFalse(provider.FileExists("media/1010/media.jpg"));
         }
+
+        [Test]
+        public void TestDeleteDirectoryRelative()
+        {
+            // Arrange
+            AzureBlobFileSystem provider = this.CreateAzureBlobFileSystem();
+
+            // Act
+            provider.AddFile("media/1010/media.jpg", Stream.Null);
+
+            // Assert
+            Assert.IsTrue(provider.DirectoryExists("media/1010"));
+
+            // Act
+            provider.DeleteDirectory("\\media\\1010");
+
+            // Assert
+            Assert.IsFalse(provider.DirectoryExists("media/1010/"));
+            Assert.IsFalse(provider.FileExists("media/1010/media.jpg"));
+        }
     }
 }

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -252,6 +252,8 @@ public void AddFile(string path, Stream stream)
         /// </param>
         public void DeleteDirectory(string path, bool recursive)
         {
+            path = this.FixPath(path);
+
             if (!this.DirectoryExists(path))
             {
                 return;