Skip to content

Commit f0ce4d5

Browse files
committed
Squashed commit of the following:
commit f080807 Author: ksemenenko <mail@ksemenenko.com> Date: Sun Jul 17 19:13:54 2022 +0200 datalake commit 43f7b03 Author: ksemenenko <mail@ksemenenko.com> Date: Sun Jul 17 15:43:05 2022 +0200 datalake commit e9c604f Author: ksemenenko <mail@ksemenenko.com> Date: Sat Jul 16 19:27:02 2022 +0200 gcp commit e18ab70 Author: ksemenenko <mail@ksemenenko.com> Date: Sat Jul 16 14:03:56 2022 +0200 FileSystem commit 6864e17 Author: ksemenenko <mail@ksemenenko.com> Date: Sat Jul 16 12:31:31 2022 +0200 aws commit 23c5105 Author: ksemenenko <mail@ksemenenko.com> Date: Fri Jul 15 22:50:20 2022 +0200 Azure commit b4ba75e Author: ksemenenko <mail@ksemenenko.com> Date: Fri Jul 15 21:29:14 2022 +0200 new api commit eba7dc3 Author: ksemenenko <mail@ksemenenko.com> Date: Sat Jun 18 18:18:03 2022 +0200 IStorageManager commit bbc7d2d Author: ksemenenko <mail@ksemenenko.com> Date: Mon May 9 22:41:18 2022 +0200 mimetypes
1 parent 24c631a commit f0ce4d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1765
-2796
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1414
<PackageReadmeFile>README.md</PackageReadmeFile>
1515
<Product>Managed Code - Storage</Product>
16-
<Version>1.2.0</Version>
17-
<PackageVersion>1.2.0</PackageVersion>
16+
<Version>1.2.1</Version>
17+
<PackageVersion>1.2.1</PackageVersion>
1818
</PropertyGroup>
1919
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
2020
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

ManagedCode.Storage.AspNetExtensions/StorageExtensions.cs

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,25 @@ public static async Task<BlobMetadata> UploadToStorageAsync(this IStorage storag
2626

2727
BlobMetadata blobMetadata = new()
2828
{
29-
Name = options.UseRandomName ? $"{Guid.NewGuid().ToString("N").ToLowerInvariant()}{extension}" : formFile.FileName,
30-
ContentType = formFile.ContentType,
31-
Rewrite = options.Rewrite
29+
Name = options.UseRandomName ? "" : formFile.FileName,
30+
MimeType = formFile.ContentType,
3231
};
3332

3433
if (formFile.Length > MinLengthForLargeFile)
3534
{
3635
var localFile = await formFile.ToLocalFileAsync(cancellationToken);
37-
38-
await storage.UploadStreamAsync(blobMetadata, localFile.FileStream, cancellationToken);
36+
await storage.UploadAsync(localFile.FileInfo, cancellationToken);
3937
}
4038
else
4139
{
4240
using (var stream = formFile.OpenReadStream())
4341
{
44-
await storage.UploadStreamAsync(blobMetadata, stream, cancellationToken);
42+
await storage.UploadAsync(stream, uploadOptions =>
43+
{
44+
uploadOptions.FileName = options.UseRandomName ? "" : formFile.FileName;
45+
uploadOptions.MimeType = formFile.ContentType;
46+
47+
} , cancellationToken);
4548
}
4649
}
4750

@@ -67,25 +70,25 @@ public static async IAsyncEnumerable<BlobMetadata> UploadToStorageAsync(this ISt
6770
return null;
6871
}
6972

70-
return new FileStreamResult(localFile.FileStream, MimeHelper.GetMimeType(localFile.FileInfo.Extension))
73+
return new FileStreamResult(localFile.Value.FileStream, MimeHelper.GetMimeType(localFile.Value.FileInfo.Extension))
7174
{
72-
FileDownloadName = localFile.FileName
75+
FileDownloadName = localFile.Value.FileName
7376
};
7477
}
7578

7679
public static async Task<FileResult?> DownloadAsFileResult(this IStorage storage, BlobMetadata blobMetadata,
7780
CancellationToken cancellationToken = default)
7881
{
79-
var localFile = await storage.DownloadAsync(blobMetadata, cancellationToken);
82+
var localFile = await storage.DownloadAsync(blobMetadata.Name, cancellationToken);
8083

8184
if (localFile is null)
8285
{
8386
return null;
8487
}
8588

86-
return new FileStreamResult(localFile.FileStream, MimeHelper.GetMimeType(localFile.FileInfo.Extension))
89+
return new FileStreamResult(localFile.Value.FileStream, MimeHelper.GetMimeType(localFile.Value.FileInfo.Extension))
8790
{
88-
FileDownloadName = localFile.FileName
91+
FileDownloadName = localFile.Value.FileName
8992
};
9093
}
9194
}

0 commit comments

Comments
 (0)