SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix resumable download issue

Browse source
This commit is contained in:
Sipke Schoorstra 2023-09-25 13:58:05 +02:00
parent 8025edfbe3
commit e75e600910
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/modules/Elsa.Http/Activities/WriteFileHttpResponse.cs
View file

@ -178,12 +178,11 @@ public class WriteFileHttpResponse : Activity
private async Task<(Blob, Stream, Func<ValueTask>)> GenerateZipFileAsync(ActivityExecutionContext context, HttpContext httpContext, ICollection<Func<ValueTask<Downloadable>>> downloadables)
{
var cancellationToken = context.CancellationToken;
var enableResumableDownloads = EnableResumableDownloads.GetOrDefault(context, () => false);
var downloadCorrelationId = GetDownloadCorrelationId(context, httpContext);
var contentType = ContentType.GetOrDefault(context);
var downloadAsFilename = Filename.GetOrDefault(context);
var zipService = context.GetRequiredService<ZipManager>();
var (zipBlob, zipStream, cleanup) = await zipService.CreateAsync(downloadables, enableResumableDownloads, downloadCorrelationId, downloadAsFilename, contentType, cancellationToken);
var (zipBlob, zipStream, cleanup) = await zipService.CreateAsync(downloadables, true, downloadCorrelationId, downloadAsFilename, contentType, cancellationToken);
return (zipBlob, zipStream, Cleanup);
@ -196,10 +195,9 @@ public class WriteFileHttpResponse : Activity
private async Task<(Blob, Stream, Func<ValueTask>)?> TryLoadCachedFileAsync(ActivityExecutionContext context, HttpContext httpContext)
{
var enableResumableDownloads = EnableResumableDownloads.GetOrDefault(context, () => false);
var downloadCorrelationId = GetDownloadCorrelationId(context, httpContext);
if (!enableResumableDownloads || string.IsNullOrWhiteSpace(downloadCorrelationId))
if (string.IsNullOrWhiteSpace(downloadCorrelationId))
return null;
var cancellationToken = context.CancellationToken;
@ -238,11 +236,12 @@ public class WriteFileHttpResponse : Activity
private async Task SendFileStream(ActivityExecutionContext context, HttpContext httpContext, Stream source, string contentType, string filename, EntityTagHeaderValue? eTag)
{
source.Seek(0, SeekOrigin.Begin);
var enableResumableDownloads = EnableResumableDownloads.GetOrDefault(context, () => false);
var result = new FileStreamResult(source, contentType)
{
EnableRangeProcessing = true,
EntityTag = eTag != null ? new Microsoft.Net.Http.Headers.EntityTagHeaderValue(eTag.ToString()) : default,
EnableRangeProcessing = enableResumableDownloads,
EntityTag = enableResumableDownloads ? eTag != null ? new Microsoft.Net.Http.Headers.EntityTagHeaderValue(eTag.ToString()) : default : default,
FileDownloadName = filename
};

4
src/modules/Elsa.Http/Services/ZipManager.cs
View file

@ -32,7 +32,7 @@ internal class ZipManager
public async Task<(Blob, Stream, Action)> CreateAsync(
ICollection<Func<ValueTask<Downloadable>>> downloadables,
bool enableResumableDownloads,
bool cache,
string? downloadCorrelationId,
string? downloadAsFilename = default,
string? contentType = default,
@ -48,7 +48,7 @@ internal class ZipManager
var zipBlob = CreateBlob(tempFilePath, downloadAsFilename, contentType);
// If resumable downloads are enabled, cache the file.
if (enableResumableDownloads && !string.IsNullOrWhiteSpace(downloadCorrelationId))
if (cache && !string.IsNullOrWhiteSpace(downloadCorrelationId))
await CreateCachedZipBlobAsync(tempFilePath, downloadCorrelationId, downloadAsFilename, contentType, cancellationToken);
var zipStream = File.OpenRead(tempFilePath);