This uses CloudBlobDirectory Prefix property to return a path rather than just the folder name, so it's more inline with the Umbraco Core Physical File Provider.

So rather than returning 1001 we now return 1001/ or querying a path with subfolders we now get back forms/form_123/ an forms/form_456/ as two subfolders inside forms which we query for.

Adding in tests for this change to the directories & paths. Along for querying subfolders.

Tests not fully passing yet - investigating further

Author: Warren Buckley

src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs

@@ -294,7 +294,7 @@ public void TestGetDirectories()
             IEnumerable<string> actual = provider.GetDirectories("/");
 
             // Assert
-            string[] expected = { "1010", "1011", "1012" };
+            string[] expected = { "1010/", "1011/", "1012/", "forms/", "testvalid/" };
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
 
@@ -315,10 +315,10 @@ public void TestGetDirectoriesPrefixed()
             IEnumerable<string> actual = provider.GetDirectories("/");
 
             // Assert
-            string[] expected = { "1010", "1011", "1012" };
+            string[] expected = { "1010/", "1011/", "1012/", "testvalid/" };
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
-
+        
         /// <summary>
         /// Asserts that the file system correctly returns a sequence of files from the root
         /// container in the correct format.
@@ -513,5 +513,56 @@ public void TestDeleteDirectoryRelative()
             Assert.IsFalse(provider.DirectoryExists("media/1010/"));
             Assert.IsFalse(provider.FileExists("media/1010/media.jpg"));
         }
+
+        /// <summary>
+        /// Asserts that the file system correctly returns a sequence of sub-directories in the
+        /// correct format.
+        /// </summary>
+        [Test]
+        public void TestGetSubDirectories()
+        {
+            // Arrange
+            AzureBlobFileSystem provider = this.CreateAzureBlobFileSystem();
+            provider.AddFile("forms/form_123/kitty.jpg", Stream.Null);
+            provider.AddFile("forms/form_123/dog.jpg", Stream.Null);
+            provider.AddFile("forms/form_456/panda.jpg", Stream.Null);
+
+            // Act
+            IEnumerable<string> actual = provider.GetDirectories("forms");
+
+            // Assert
+            string[] expected = { "forms/form_123/", "forms/form_456/" };
+            Assert.IsTrue(expected.SequenceEqual(actual));
+        }
+
+        /// <summary>
+        /// Asserts that the file system correctly returns a sequence of sub-directories in the
+        /// correct format.
+        /// </summary>
+        [Test]
+        public void TestGetSubDirectoriesAndFiles()
+        {
+            // Arrange
+            AzureBlobFileSystem provider = this.CreateAzureBlobFileSystem();
+            provider.AddFile("forms/form_123/kitty.jpg", Stream.Null);
+            provider.AddFile("forms/form_123/dog.jpg", Stream.Null);
+            provider.AddFile("forms/form_456/panda.jpg", Stream.Null);
+
+            // Act
+            var subfolders = provider.GetDirectories("forms");
+            var actual = new List<string>();
+
+            foreach (var folder in subfolders)
+            {
+                // Get files in subfolder and add to a single collection
+                actual.AddRange(provider.GetFiles(folder));
+            }
+
+            // Assert
+            string[] expected = { "forms/form_123/kitty.jpg", "forms/form_123/dog.jpg", "forms/form_456/panda.jpg" };
+            Assert.IsTrue(expected.SequenceEqual(actual));
+        }
+        
+
     }
 }

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -388,12 +388,10 @@ public IEnumerable<string> GetDirectories(string path)
         {
             CloudBlobDirectory directory = this.GetDirectoryReference(path);
 
-            IEnumerable<IListBlobItem> blobs = directory.ListBlobs().Where(blob => blob is CloudBlobDirectory);
+            IEnumerable<IListBlobItem> blobs = directory.ListBlobs().Where(blob => blob is CloudBlobDirectory).ToList();
 
             // 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]);
-
+            return blobs.Cast<CloudBlobDirectory>().Select(cd => cd.Prefix);
         }
 
         /// <summary>