Range support for FileResult(#6150)

Addresses #3702
aspnet · May 19, 2017 · 9aff0a6 · 9aff0a6
1 parent ece5e74
commit 9aff0a6
Show file tree

Hide file tree

Showing 21 changed files with 2,655 additions and 84 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Core;
 using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Net.Http.Headers;

diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs
@@ -2,8 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Mvc
 {
@@ -43,5 +42,15 @@ public string FileDownloadName
             get { return _fileDownloadName ?? string.Empty; }
             set { _fileDownloadName = value; }
         }
+
+        /// <summary>
+        /// Gets or sets the last modified information associated with the <see cref="FileResult"/>.
+        /// </summary>
+        public DateTimeOffset? LastModified { get; set; }
+
+        /// <summary>
+        /// Gets or sets the etag associated with the <see cref="FileResult"/>.
+        /// </summary>
+        public EntityTagHeaderValue EntityTag { get; set; }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/FileContentResultExecutor.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/FileContentResultExecutor.cs
@@ -2,8 +2,10 @@
 // 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.Tasks;
 using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Mvc.Internal
 {
@@ -26,11 +28,22 @@ public virtual Task ExecuteAsync(ActionContext context, FileContentResult result
                 throw new ArgumentNullException(nameof(result));
             }
 
-            SetHeadersAndLog(context, result);
-            return WriteFileAsync(context, result);
+            var (range, rangeLength, serveBody) = SetHeadersAndLog(
+                context,
+                result,
+                result.FileContents.Length,
+                result.LastModified,
+                result.EntityTag);
+
+            if (!serveBody)
+            {
+                return Task.CompletedTask;
+            }
+
+            return WriteFileAsync(context, result, range, rangeLength);
         }
 
-        protected virtual Task WriteFileAsync(ActionContext context, FileContentResult result)
+        protected virtual Task WriteFileAsync(ActionContext context, FileContentResult result, RangeItemHeaderValue range, long rangeLength)
         {
             if (context == null)
             {
@@ -42,9 +55,15 @@ protected virtual Task WriteFileAsync(ActionContext context, FileContentResult r
                 throw new ArgumentNullException(nameof(result));
             }
 
-            var response = context.HttpContext.Response;
+            if (range != null && rangeLength == 0)
+            {
+                return Task.CompletedTask;
+            }
 
-            return response.Body.WriteAsync(result.FileContents, offset: 0, count: result.FileContents.Length);
+            var response = context.HttpContext.Response;
+            var outputStream = response.Body;
+            var fileContentsStream = new MemoryStream(result.FileContents);
+            return WriteFileAsync(context.HttpContext, fileContentsStream, range, rangeLength);
         }
     }
 }