huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed SaveAs[Async](string) to CopyTo[Async](Stream)

This commit is contained in:
Kristian Hellang 2016-01-22 09:51:43 +01:00 committed by Chris R
parent 4a3e2ad3c5
commit cb09ffccce
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.AspNetCore.Http.Abstractions/IFormFile.cs
View File

@ -48,16 +48,16 @@ namespace Microsoft.AspNetCore.Http
Stream OpenReadStream();
/// <summary>
/// Saves the contents of the uploaded file.
/// Copies the contents of the uploaded file to the <paramref name="target"/> stream.
/// </summary>
/// <param name="path">The path of the file to create.</param>
void SaveAs(string path);
/// <param name="target">The stream to copy the file contents to.</param>
void CopyTo(Stream target);
/// <summary>
/// Asynchronously saves the contents of the uploaded file.
/// Asynchronously copies the contents of the uploaded file to the <paramref name="target"/> stream.
/// </summary>
/// <param name="path">The path of the file to create.</param>
/// <param name="target">The stream to copy the file contents to.</param>
/// <param name="cancellationToken"></param>
Task SaveAsAsync(string path, CancellationToken cancellationToken = default(CancellationToken));
Task CopyToAsync(Stream target, CancellationToken cancellationToken = default(CancellationToken));
}
}

33
src/Microsoft.AspNetCore.Http/Features/FormFile.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
@ -72,29 +73,37 @@ namespace Microsoft.AspNetCore.Http.Features.Internal
}
/// <summary>
/// Saves the contents of the uploaded file.
/// Copies the contents of the uploaded file to the <paramref name="target"/> stream.
/// </summary>
/// <param name="path">The path of the file to create.</param>
public void SaveAs(string path)
/// <param name="target">The stream to copy the file contents to.</param>
public void CopyTo(Stream target)
{
using (var fileStream = File.Create(path, DefaultBufferSize))
if (target == null)
{
var inputStream = OpenReadStream();
inputStream.CopyTo(fileStream, DefaultBufferSize);
throw new ArgumentNullException(nameof(target));
}
using (var readStream = OpenReadStream())
{
readStream.CopyTo(target, DefaultBufferSize);
}
}
/// <summary>
/// Asynchronously saves the contents of the uploaded file.
/// Asynchronously copies the contents of the uploaded file to the <paramref name="target"/> stream.
/// </summary>
/// <param name="path">The path of the file to create.</param>
/// <param name="target">The stream to copy the file contents to.</param>
/// <param name="cancellationToken"></param>
public async Task SaveAsAsync(string path, CancellationToken cancellationToken = default(CancellationToken))
public async Task CopyToAsync(Stream target, CancellationToken cancellationToken = default(CancellationToken))
{
using (var fileStream = File.Create(path, DefaultBufferSize, FileOptions.Asynchronous))
if (target == null)
{
var inputStream = OpenReadStream();
await inputStream.CopyToAsync(fileStream, DefaultBufferSize, cancellationToken);
throw new ArgumentNullException(nameof(target));
}
using (var readStream = OpenReadStream())
{
await readStream.CopyToAsync(target, DefaultBufferSize, cancellationToken);
}
}
}