Fix BlobFileStore (#3336)

Fixes #3280
OrchardCMS · Mar 15, 2019 · 023b3a9 · 023b3a9
1 parent 6f42499
commit 023b3a9
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFileStore.cs b/src/OrchardCore/OrchardCore.FileStorage.AzureBlob/BlobFileStore.cs
@@ -88,11 +88,10 @@ public async Task<IFileStoreEntry> GetDirectoryInfoAsync(string path)
         {
             await _verifyContainerTask;
 
-            var placeholderBlob = GetBlobReference(this.Combine(path, _directoryMarkerFileName));
+            var blobDirectory = GetBlobDirectoryReference(path);
 
-            if (await placeholderBlob.ExistsAsync())
+            if (path == string.Empty || await BlobDirectoryExists(blobDirectory))
             {
-                var blobDirectory = GetBlobDirectoryReference(path);
                 return new BlobDirectory(path, _clock.UtcNow);
             }
             return null;
@@ -299,6 +298,21 @@ await placeholderBlob.UploadTextAsync(
                 "This is a directory marker file created by Orchard Core. It is safe to delete it.");
         }
 
+        private async Task<bool> BlobDirectoryExists(CloudBlobDirectory blobDirectory)
+        {
+            // CloudBlobDirectory exists if it has at least one blob
+            BlobContinuationToken continuationToken = null;
+            var segment = await blobDirectory.ListBlobsSegmentedAsync(
+                useFlatBlobListing: false,
+                blobListingDetails: BlobListingDetails.None,
+                maxResults: 1,
+                currentToken: continuationToken,
+                options: null,
+                operationContext: null);
+
+            return segment.Results.Any();
+        }
+
         private async Task CreateBasePathIfNotExistsAsync()
         {
             if (string.IsNullOrEmpty(_options.BasePath))