Merge branch 'support/10.0.x' into support/12.0.x

Author: ronaldbarendse

src/Umbraco.StorageProviders.AzureBlob/IO/AzureBlobFileSystem.cs

@@ -53,6 +53,7 @@ public AzureBlobFileSystem(AzureBlobFileSystemOptions options, IHostingEnvironme
     /// <exception cref="System.ArgumentNullException"><paramref name="blobContainerClient" /> is <c>null</c>.</exception>
     /// <exception cref="System.ArgumentNullException"><paramref name="ioHelper" /> is <c>null</c>.</exception>
     /// <exception cref="System.ArgumentNullException"><paramref name="contentTypeProvider" /> is <c>null</c>.</exception>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1054:URI-like parameters should not be strings", Justification = "This parameter is only a part of the URL.")]
     public AzureBlobFileSystem(string rootUrl, BlobContainerClient blobContainerClient, IIOHelper ioHelper, IContentTypeProvider contentTypeProvider, string? containerRootPath = null)
     {
         ArgumentNullException.ThrowIfNull(rootUrl);
@@ -92,7 +93,7 @@ public IEnumerable<string> GetDirectories(string path)
     {
         ArgumentNullException.ThrowIfNull(path);
 
-        return ListBlobs(GetDirectoryPath(path))
+        return ListBlobs(path)
             .Where(x => x.IsPrefix)
             .Select(x => GetRelativePath($"/{x.Prefix}").Trim('/'));
     }
@@ -112,13 +113,9 @@ public void DeleteDirectory(string path, bool recursive)
     {
         ArgumentNullException.ThrowIfNull(path);
 
-        foreach (BlobHierarchyItem blob in ListBlobs(GetDirectoryPath(path)))
+        foreach (BlobHierarchyItem blob in ListBlobs(path, true))
         {
-            if (blob.IsPrefix)
-            {
-                DeleteDirectory(blob.Prefix, true);
-            }
-            else if (blob.IsBlob)
+            if (blob.IsBlob)
             {
                 _container.GetBlobClient(blob.Blob.Name).DeleteIfExists();
             }
@@ -131,7 +128,10 @@ public bool DirectoryExists(string path)
     {
         ArgumentNullException.ThrowIfNull(path);
 
-        return GetBlobClient(GetDirectoryPath(path)).Exists();
+        // Try getting a single item/page
+        Page<BlobHierarchyItem>? firstPage = ListBlobs(path).AsPages(pageSizeHint: 1).FirstOrDefault();
+
+        return firstPage?.Values.Count > 0;
     }
 
     /// <inheritdoc />
@@ -156,7 +156,7 @@ public void AddFile(string path, Stream stream, bool overrideIfExists)
         BlobClient blob = GetBlobClient(path);
         if (!overrideIfExists && blob.Exists())
         {
-            throw new InvalidOperationException($"A file at path '{path}' already exists");
+            throw new InvalidOperationException($"A file at path '{path}' already exists.");
         }
 
         var headers = new BlobHttpHeaders();
@@ -188,7 +188,7 @@ public void AddFile(string path, string physicalPath, bool overrideIfExists = tr
         BlobClient destinationBlob = GetBlobClient(path);
         if (!overrideIfExists && destinationBlob.Exists())
         {
-            throw new InvalidOperationException($"A file at path '{path}' already exists");
+            throw new InvalidOperationException($"A file at path '{path}' already exists.");
         }
 
         BlobClient sourceBlob = GetBlobClient(physicalPath);
@@ -228,7 +228,7 @@ public IEnumerable<string> GetFiles(string path, string? filter)
     {
         ArgumentNullException.ThrowIfNull(path);
 
-        IEnumerable<string> files = ListBlobs(GetDirectoryPath(path)).Where(x => x.IsBlob).Select(x => x.Blob.Name);
+        IEnumerable<string> files = ListBlobs(path).Where(x => x.IsBlob).Select(x => x.Blob.Name);
         if (!string.IsNullOrEmpty(filter) && filter != "*.*")
         {
             // TODO: Might be better to use a globbing library
@@ -268,6 +268,7 @@ public bool FileExists(string path)
 
     /// <inheritdoc />
     /// <exception cref="System.ArgumentNullException"><paramref name="fullPathOrUrl" /> is <c>null</c>.</exception>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1054:URI-like parameters should not be strings", Justification = "This method is inherited from an interface.")]
     public string GetRelativePath(string fullPathOrUrl)
     {
         ArgumentNullException.ThrowIfNull(fullPathOrUrl);
@@ -298,6 +299,7 @@ public string GetFullPath(string path)
 
     /// <inheritdoc />
     /// <exception cref="System.ArgumentNullException"><paramref name="path" /> is <c>null</c>.</exception>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1055:URI-like return values should not be strings", Justification = "This method is inherited from an interface.")]
     public string GetUrl(string? path)
     {
         ArgumentNullException.ThrowIfNull(path);
@@ -338,7 +340,7 @@ public BlobClient GetBlobClient(string path)
     {
         ArgumentNullException.ThrowIfNull(path);
 
-        return _container.GetBlobClient(GetBlobPath(path));
+        return _container.GetBlobClient(GetBlobName(path));
     }
 
     /// <inheritdoc />
@@ -347,17 +349,15 @@ public BlobClient GetBlobClient(string path)
     private static string EnsureUrlSeparatorChar(string path)
         => path.Replace("\\", "/", StringComparison.InvariantCultureIgnoreCase);
 
-    private string GetDirectoryPath(string fullPathOrUrl)
+    private Pageable<BlobHierarchyItem> ListBlobs(string path, bool recursive = false)
     {
-        var path = GetFullPath(fullPathOrUrl);
+        string? delimiter = recursive ? null : "/";
+        string prefix = GetFullPath(path).EnsureEndsWith('/');
 
-        return path.Length == 0 ? path : path.EnsureEndsWith('/');
+        return _container.GetBlobsByHierarchy(delimiter: delimiter, prefix: prefix);
     }
 
-    private IEnumerable<BlobHierarchyItem> ListBlobs(string path)
-        => _container.GetBlobsByHierarchy(prefix: path);
-
-    private string GetBlobPath(string path)
+    private string GetBlobName(string path)
     {
         path = EnsureUrlSeparatorChar(path);
 

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "12.1.0-alpha",
+  "version": "12.0.1-alpha",
   "assemblyVersion": {
     "precision": "build"
   },