Added cascade for sample project. Some fixes for AspNetExtensions (#18)

Author: dtymakhov

ManagedCode.Storage.AspNetExtensions/FormFileExtensions.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using ManagedCode.Storage.Core;
@@ -12,23 +13,19 @@ public static class FormFileExtensions
     public static async Task<LocalFile> ToLocalFileAsync(this IFormFile formFile, CancellationToken cancellationToken = default)
     {
         var tempPath = Path.GetTempPath();
-        LocalFile localFile = new($"{tempPath}/{formFile.Name}");
+        LocalFile localFile = new($"{tempPath}/{formFile.FileName}");
 
         await formFile.CopyToAsync(localFile.FileStream, cancellationToken);
 
         return localFile;
     }
 
-    public static async Task<IEnumerable<LocalFile>> ToLocalFilesAsync(this IFormFileCollection formFileCollection,
-        CancellationToken cancellationToken = default)
+    public static async IAsyncEnumerable<LocalFile> ToLocalFilesAsync(this IFormFileCollection formFileCollection,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        List<LocalFile> localFiles = new();
-
         foreach (var formFile in formFileCollection)
         {
-            localFiles.Add(await formFile.ToLocalFileAsync(cancellationToken));
+            yield return await formFile.ToLocalFileAsync(cancellationToken);
         }
-
-        return localFiles;
     }
 }

ManagedCode.Storage.AspNetExtensions/StorageExtensions.cs

@@ -1,21 +1,24 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using ManagedCode.Storage.AspNetExtensions.Options;
 using ManagedCode.Storage.Core;
+using ManagedCode.Storage.Core.Helpers;
 using ManagedCode.Storage.Core.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using ManagedCode.Storage.AspNetExtensions.Helpers;
 
 namespace ManagedCode.Storage.AspNetExtensions;
 
 public static class StorageExtensions
 {
     private const int MinLengthForLargeFile = 256 * 1024;
 
-    public static async Task<string> UploadToStorageAsync(this IStorage storage, IFormFile formFile, UploadToStorageOptions? options = null,
+    public static async Task<BlobMetadata> UploadToStorageAsync(this IStorage storage, IFormFile formFile, UploadToStorageOptions? options = null,
         CancellationToken cancellationToken = default)
     {
         options ??= new UploadToStorageOptions();
@@ -43,7 +46,17 @@ public static async Task<string> UploadToStorageAsync(this IStorage storage, IFo
             }
         }
 
-        return blobMetadata.Name;
+        return blobMetadata;
+    }
+
+    public static async IAsyncEnumerable<BlobMetadata> UploadToStorageAsync(this IStorage storage, IFormFileCollection formFiles,
+        UploadToStorageOptions? options = null,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
+    {
+        foreach (var formFile in formFiles)
+        {
+            yield return await storage.UploadToStorageAsync(formFile, options, cancellationToken);
+        }
     }
 
     public static async Task<FileResult> DownloadAsFileResult(this IStorage storage, string blobName, CancellationToken cancellationToken = default)

ManagedCode.Storage.Aws/AWSStorage.cs

@@ -161,7 +161,7 @@ public async Task<BlobMetadata> GetBlobAsync(string blobName, CancellationToken
 
         return new BlobMetadata
         {
-            Name = blobName
+            Name = blobName,
             //Container = containerName,
             //Length = objectMetaResponse.Headers.ContentLength,
             //ETag = objectMetaResponse.ETag,

ManagedCode.Storage.Azure/AzureStorage.cs

@@ -145,7 +145,8 @@ public async Task<BlobMetadata> GetBlobAsync(string blobName, CancellationToken
         return new BlobMetadata
         {
             Name = blobClient.Name,
-            Uri = blobClient.Uri
+            Uri = blobClient.Uri,
+            Container = blobClient.BlobContainerName,
         };
     }
 

…e.AspNetExtensions/Helpers/MimeHelper.cs …dCode.Storage.Core/Helpers/MimeHelper.csManagedCode.Storage.AspNetExtensions/Helpers/MimeHelper.cs renamed to ManagedCode.Storage.Core/Helpers/MimeHelper.cs ManagedCode.Storage.AspNetExtensions/Helpers/MimeHelper.cs renamed to ManagedCode.Storage.Core/Helpers/MimeHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ManagedCode.Storage.AspNetExtensions.Helpers;
+namespace ManagedCode.Storage.Core.Helpers;
 
 public class MimeHelper
 {

ManagedCode.Storage.Core/Models/BlobMetadata.cs

@@ -5,7 +5,7 @@ namespace ManagedCode.Storage.Core.Models;
 public class BlobMetadata
 {
     public string Name { get; set; } = null!;
-    public Uri? Uri { get; set; } = null!;
+    public Uri? Uri { get; set; }
     public string? Container { get; set; }
     public string? ContentType { get; set; }
     public bool Rewrite { get; set; }

ManagedCode.Storage.FileSystem/FileSystemStorage.cs

@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using ManagedCode.Storage.Core;
+using ManagedCode.Storage.Core.Helpers;
 using ManagedCode.Storage.Core.Models;
 using ManagedCode.Storage.FileSystem.Options;
 
@@ -156,12 +157,13 @@ public Task<BlobMetadata> GetBlobAsync(string blobName, CancellationToken cancel
             var result = new BlobMetadata
             {
                 Name = fileInfo.Name,
-                Uri = new Uri(Path.Combine(_path, blobName))
+                Uri = new Uri(Path.Combine(_path, blobName)),
+                ContentType = MimeHelper.GetMimeType(fileInfo.Extension)
             };
             return Task.FromResult(result);
         }
 
-        return null;
+        return Task.FromResult<BlobMetadata>(null);
     }
 
     public async IAsyncEnumerable<BlobMetadata> GetBlobListAsync(

ManagedCode.Storage.Tests/AWS/AWSStorageTests.cs

@@ -16,13 +16,13 @@ protected override ServiceProvider ConfigureServices()
     {
         var services = new ServiceCollection();
 
-        //aws libarary overwrites property values. you should only create configurations this way. 
+        // AWS library overwrites property values. you should only create configurations this way. 
         var awsConfig = new AmazonS3Config
         {
             RegionEndpoint = RegionEndpoint.EUWest1,
             ForcePathStyle = true,
             UseHttp = true,
-            ServiceURL = "http://localhost:4566" //this is the default port for the aws s3 emulator, must be last in the list
+            ServiceURL = "http://localhost:4566" // this is the default port for the aws s3 emulator, must be last in the list
         };
 
         services.AddAWSStorageAsDefault(opt =>

ManagedCode.Storage.Tests/AspNetExtensions/FormFileExtensionsTests.cs

@@ -58,7 +58,7 @@ public async Task ToLocalFilesAsync_SmallFiles()
         }
 
         // Act
-        var localFiles = (await collection.ToLocalFilesAsync()).ToList();
+        var localFiles = await collection.ToLocalFilesAsync().ToListAsync();
 
         // Assert
         localFiles.Count.Should().Be(filesCount);

ManagedCode.Storage.Tests/AspNetExtensions/StorageExtensionsTests.cs

@@ -3,9 +3,9 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using ManagedCode.Storage.AspNetExtensions;
-using ManagedCode.Storage.AspNetExtensions.Helpers;
 using ManagedCode.Storage.AspNetExtensions.Options;
 using ManagedCode.Storage.Core;
+using ManagedCode.Storage.Core.Helpers;
 using ManagedCode.Storage.Core.Models;
 using ManagedCode.Storage.FileSystem.Extensions;
 using Microsoft.Extensions.DependencyInjection;
@@ -89,7 +89,7 @@ public async Task UploadToStorageAsync_WithRandomName()
 
         // Assert
         localFile.FileInfo.Length.Should().Be(formFile.Length);
-        localFile.FileName.Should().Be(newFileName);
+        localFile.FileName.Should().Be(newFileName.Name);
         localFile.FileName.Should().NotBe(formFile.FileName);
 
         await Storage.DeleteAsync(fileName);