Enhance storage functionality with cancellation support and metadata updates

+ Nuget

Author: KSemenenko

Directory.Build.props

@@ -26,8 +26,8 @@
         <RepositoryUrl>https://github.com/managedcode/Storage</RepositoryUrl>
         <PackageProjectUrl>https://github.com/managedcode/Storage</PackageProjectUrl>
         <Product>Managed Code - Storage</Product>
-        <Version>9.0.3</Version>
-        <PackageVersion>9.0.3</PackageVersion>
+        <Version>9.0.4</Version>
+        <PackageVersion>9.0.4</PackageVersion>
 
     </PropertyGroup>
 

Integraions/ManagedCode.Storage.Client.SignalR/ManagedCode.Storage.Client.SignalR.csproj

@@ -19,7 +19,7 @@
 
     <ItemGroup>
         <PackageReference Include="ManagedCode.MimeTypes" Version="1.0.2" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.3" />
     </ItemGroup>
 
 </Project>

Integraions/ManagedCode.Storage.Server/Extensions/Storage/StorageFromFileExtensions.cs

@@ -13,41 +13,23 @@ namespace ManagedCode.Storage.Server.Extensions.Storage;
 
 public static class StorageFromFileExtensions
 {
-    private const int MinLengthForLargeFile = 256 * 1024;
-
     public static async Task<Result<BlobMetadata>> UploadToStorageAsync(this IStorage storage, IFormFile formFile, UploadOptions? options = null,
         CancellationToken cancellationToken = default)
     {
         options ??= new UploadOptions(formFile.FileName, mimeType: formFile.ContentType);
 
-        if (formFile.Length > MinLengthForLargeFile)
-        {
-            var localFile = await formFile.ToLocalFileAsync(cancellationToken);
-            return await storage.UploadAsync(localFile.FileInfo, options, cancellationToken);
-        }
-
-        await using (var stream = formFile.OpenReadStream())
-        {
-            return await storage.UploadAsync(stream, options, cancellationToken);
-        }
+        await using var stream = formFile.OpenReadStream();
+        return await storage.UploadAsync(stream, options, cancellationToken);
     }
 
     public static async Task<Result<BlobMetadata>> UploadToStorageAsync(this IStorage storage, IFormFile formFile, Action<UploadOptions> options,
         CancellationToken cancellationToken = default)
     {
         var newOptions = new UploadOptions(formFile.FileName, mimeType: formFile.ContentType);
         options.Invoke(newOptions);
-
-        if (formFile.Length > MinLengthForLargeFile)
-        {
-            var localFile = await formFile.ToLocalFileAsync(cancellationToken);
-            return await storage.UploadAsync(localFile.FileInfo, newOptions, cancellationToken);
-        }
-
-        await using (var stream = formFile.OpenReadStream())
-        {
-            return await storage.UploadAsync(stream, newOptions, cancellationToken);
-        }
+        
+        await using var stream = formFile.OpenReadStream();
+        return await storage.UploadAsync(stream, newOptions, cancellationToken);
     }
 
     public static async IAsyncEnumerable<Result<BlobMetadata>> UploadToStorageAsync(this IStorage storage, IFormFileCollection formFiles,

ManagedCode.Storage.Core/BaseStorage.cs

@@ -15,20 +15,36 @@ public abstract class BaseStorage<T, TOptions> : IStorage<T, TOptions> where TOp
 {
     protected bool IsContainerCreated;
     protected TOptions StorageOptions;
+    private readonly SemaphoreSlim _semaphoreSlim = new(1, 1);
 
     protected BaseStorage(TOptions storageOptions)
     {
         Contract.Assert(storageOptions is not null);
         StorageOptions = storageOptions!;
+        // ReSharper disable once VirtualMemberCallInConstructor
         StorageClient = CreateStorageClient();
     }
 
     public async Task<Result> CreateContainerAsync(CancellationToken cancellationToken = default)
     {
-        var result = await CreateContainerInternalAsync(cancellationToken);
-        cancellationToken.ThrowIfCancellationRequested();
-        IsContainerCreated = result.IsSuccess;
-        return result;
+        try
+        {
+            await _semaphoreSlim.WaitAsync(cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+            
+            var result = await CreateContainerInternalAsync(cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+            IsContainerCreated = result.IsSuccess;
+            return result;
+        }
+        catch (Exception ex)
+        {
+            return Result.Fail(ex);
+        }
+        finally
+        {
+            _semaphoreSlim.Release();
+        }
     }
 
     public abstract Task<Result> RemoveContainerAsync(CancellationToken cancellationToken = default);
@@ -89,15 +105,15 @@ public Task<Result<BlobMetadata>> UploadAsync(FileInfo fileInfo, Action<UploadOp
     public Task<Result<BlobMetadata>> UploadAsync(Stream stream, UploadOptions options, CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrWhiteSpace(options.MimeType))
-            options.MimeType = MimeHelper.BIN;
+            options.MimeType = MimeHelper.GetMimeType(options.FileName);
 
         return UploadInternalAsync(stream, SetUploadOptions(options), cancellationToken);
     }
 
     public Task<Result<BlobMetadata>> UploadAsync(byte[] data, UploadOptions options, CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrWhiteSpace(options.MimeType))
-            options.MimeType = MimeHelper.BIN;
+            options.MimeType = MimeHelper.GetMimeType(options.FileName);
 
         return UploadInternalAsync(new MemoryStream(data), SetUploadOptions(options), cancellationToken);
     }
@@ -269,13 +285,16 @@ public Task<Result> SetStorageOptions(Action<TOptions> options, CancellationToke
 
     protected abstract T CreateStorageClient();
 
-    protected Task<Result> EnsureContainerExist()
+    protected Task<Result> EnsureContainerExist(CancellationToken cancellationToken = default)
     {
+        if (StorageClient is null)
+            throw new InvalidOperationException("Storage client is not initialized.");
+
         if (IsContainerCreated)
             return Result.Succeed()
                 .AsTask();
 
-        return CreateContainerAsync();
+        return CreateContainerAsync(cancellationToken);
     }
 
     protected UploadOptions SetUploadOptions(UploadOptions options)

ManagedCode.Storage.Core/ManagedCode.Storage.Core.csproj

@@ -15,8 +15,8 @@
     <ItemGroup>
         <PackageReference Include="ManagedCode.Communication" Version="9.0.0" />
         <PackageReference Include="ManagedCode.MimeTypes" Version="1.0.2" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
     </ItemGroup>
 
 </Project>

ManagedCode.Storage.Core/Models/BaseOptions.cs

@@ -4,7 +4,7 @@ namespace ManagedCode.Storage.Core.Models;
 
 public abstract class BaseOptions
 {
-    public string FileName { get; set; } = $"{Guid.NewGuid():N}";
+    public string FileName { get; set; } = string.Empty;
     public string? Directory { get; set; }
 
     // TODO: Check this

ManagedCode.Storage.Core/Models/BlobMetadata.cs

@@ -13,5 +13,5 @@ public class BlobMetadata
     public DateTimeOffset CreatedOn { get; set; }
     public string? Container { get; set; }
     public string? MimeType { get; set; }
-    public long Length { get; set; }
+    public ulong Length { get; set; }
 }

ManagedCode.Storage.Core/Models/MetadataOptions.cs

@@ -6,4 +6,6 @@ public static MetadataOptions FromBaseOptions(BaseOptions options)
     {
         return new MetadataOptions { FileName = options.FileName, Directory = options.Directory };
     }
+    
+    public string ETag { get; set; } = string.Empty;
 }