Merge pull request #48 from warrenbuckley/Paths

Path FixUp & SubDirectories

Author: Jeavon

src/UmbracoFileSystemProviders.Azure.Tests/AzureBlobFileSystemTestsBase.cs

@@ -318,7 +318,7 @@ public void TestGetDirectoriesPrefixed()
             string[] expected = { "1010", "1011", "1012" };
             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.
@@ -455,6 +455,24 @@ 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"));
+
+            // Tidy up after test
+            provider.DeleteDirectory("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>
@@ -498,5 +516,60 @@ 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));
+
+            // Tidy up after test
+            provider.DeleteDirectory("forms");
+        }
+
+        /// <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/dog.jpg", "forms/form_123/kitty.jpg", "forms/form_456/panda.jpg" };
+            Assert.IsTrue(expected.SequenceEqual(actual));
+
+            // Tidy up after test
+            provider.DeleteDirectory("forms");
+        }
     }
 }

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -277,15 +277,31 @@ public void DeleteDirectory(string path, bool recursive)
 
             CloudBlobDirectory directory = this.GetDirectoryReference(path);
 
-            IEnumerable<CloudBlockBlob> blobs = directory.ListBlobs().OfType<CloudBlockBlob>();
+            // WB: This will only delete a folder if it only has files & not sub directories
+            // IEnumerable<CloudBlockBlob> blobs = directory.ListBlobs().OfType<CloudBlockBlob>();
+
+            IEnumerable<IListBlobItem> blobs = directory.ListBlobs();
+
 
             if (recursive)
             {
-                foreach (CloudBlockBlob blockBlob in blobs)
+                foreach (var blobItem in blobs)
                 {
                     try
                     {
-                        blockBlob.Delete(DeleteSnapshotsOption.IncludeSnapshots);
+                        if (blobItem is CloudBlobDirectory)
+                        {
+                            var blobFolder = blobItem as CloudBlobDirectory;
+
+                            // Resurssively call this method
+                            this.DeleteDirectory(blobFolder.Prefix);
+                        }
+                        else
+                        {
+                            // Can assume its a file aka CloudBlob
+                            var blobFile = blobItem as CloudBlockBlob;
+                            blobFile?.DeleteIfExists(DeleteSnapshotsOption.IncludeSnapshots);
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -337,7 +353,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 +404,10 @@ 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).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.TrimEnd('/'));
         }
 
         /// <summary>