Ensuring that GetDirectories only returns directories

Author: Jeavon

src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs

@@ -455,6 +455,21 @@ public void TestDeleteDirectory()
             Assert.IsFalse(provider.FileExists("1010/media.jpg"));
         }
 
+        [Test]
+        public void TestValidDirectory()
+        {
+            AzureBlobFileSystem provider = this.CreateAzureBlobFileSystem();
+            provider.AddFile("testvalid/test.txt", Stream.Null);
+            Assert.IsTrue(provider.DirectoryExists("testvalid"));
+        }
+
+        [Test]
+        public void TestInvalidDirectory()
+        {
+            AzureBlobFileSystem provider = this.CreateAzureBlobFileSystem();
+            Assert.IsFalse(provider.DirectoryExists("testinvalid/"));
+        }
+
         /// <summary>
         /// Asserts that the file system correctly deletes a directory when the input has been prefixed.
         /// </summary>

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -285,7 +285,7 @@ public void DeleteDirectory(string path, bool recursive)
                 {
                     try
                     {
-                        blockBlob.Delete(DeleteSnapshotsOption.IncludeSnapshots);
+                        blockBlob.DeleteIfExists(DeleteSnapshotsOption.IncludeSnapshots);
                     }
                     catch (Exception ex)
                     {
@@ -337,7 +337,10 @@ public void DeleteFile(string path)
         /// </returns>
         public bool DirectoryExists(string path)
         {
-            return this.GetDirectories(path).Any();
+            var fixedPath = this.FixPath(path);
+            var directory = this.cloudBlobContainer.GetDirectoryReference(fixedPath);
+
+            return directory.ListBlobs().Any();
         }
 
         /// <summary>
@@ -385,11 +388,12 @@ public IEnumerable<string> GetDirectories(string path)
         {
             CloudBlobDirectory directory = this.GetDirectoryReference(path);
 
-            IEnumerable<IListBlobItem> blobs = directory.ListBlobs();
+            IEnumerable<IListBlobItem> blobs = directory.ListBlobs().Where(blob => blob is CloudBlobDirectory);
 
             // Always get last segment for media sub folder simulation. E.g 1001, 1002
             return blobs.Select(cd =>
                                 cd.Uri.Segments[cd.Uri.Segments.Length - 1].Split(Delimiter.ToCharArray())[0]);
+
         }
 
         /// <summary>