Changed to IFileInfo instead of file name string

Author: khellang

src/Microsoft.AspNetCore.Http.Abstractions/HttpResponse.cs

@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.FileProviders;
 
 namespace Microsoft.AspNetCore.Http
 {
@@ -109,41 +110,53 @@ public abstract class HttpResponse
         /// <summary>
         /// Sends the given file using the SendFile extension.
         /// </summary>
-        /// <param name="fileName">The full path to the file.</param>
+        /// <param name="file">The file to send.</param>
         /// <returns></returns>
-        public virtual Task SendFileAsync(string fileName)
+        public virtual Task SendFileAsync(IFileInfo file)
         {
-            if (fileName == null)
+            if (file == null)
             {
-                throw new ArgumentNullException(nameof(fileName));
+                throw new ArgumentNullException(nameof(file));
             }
 
-            return SendFileAsync(fileName, 0, null, CancellationToken.None);
+            return SendFileAsync(file, 0, null, CancellationToken.None);
         }
 
         /// <summary>
         /// Sends the given file using the SendFile extension.
         /// </summary>
-        /// <param name="fileName">The full path to the file.</param>
+        /// <param name="file">The file to send.</param>
         /// <param name="offset">The offset in the file.</param>
         /// <param name="count">The number of types to send, or null to send the remainder of the file.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public virtual Task SendFileAsync(string fileName, long offset, long? count, CancellationToken cancellationToken = default(CancellationToken))
+        public virtual async Task SendFileAsync(IFileInfo file, long offset, long? count, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (fileName == null)
+            if (file == null)
             {
-                throw new ArgumentNullException(nameof(fileName));
+                throw new ArgumentNullException(nameof(file));
+            }
+
+            if (string.IsNullOrEmpty(file.PhysicalPath))
+            {
+                using (var readStream = file.CreateReadStream())
+                {
+                    readStream.Seek(offset, SeekOrigin.Begin); // TODO: What if !CanSeek?
+
+                    await StreamCopyOperation.CopyToAsync(readStream, Body, count, cancellationToken);
+                    return;
+                }
             }
 
             var sendFile = HttpContext.Features.Get<IHttpSendFileFeature>();
 
             if (sendFile == null)
             {
-                return SendFileAsync(Body, fileName, offset, count, cancellationToken);
+                await SendFileAsync(Body, file.PhysicalPath, offset, count, cancellationToken);
+                return;
             }
 
-            return sendFile.SendFileAsync(fileName, offset, count, cancellationToken);
+            await sendFile.SendFileAsync(file.PhysicalPath, offset, count, cancellationToken);
         }
 
         // Not safe for overlapped writes.

src/Microsoft.AspNetCore.Http.Abstractions/project.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http.Features": "1.0.0-*",
+    "Microsoft.Extensions.FileProviders.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.ActivatorUtilities.Sources": {
       "type": "build",
       "version": "1.0.0-*"

test/Microsoft.AspNetCore.Http.Extensions.Tests/SendFileResponseExtensionsTests.cs renamed to test/Microsoft.AspNetCore.Http.Abstractions.Tests/SendFileTests.cs

@@ -6,19 +6,13 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.Extensions.FileProviders;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Http.Extensions.Tests
+namespace Microsoft.AspNetCore.Http.Tests
 {
-    public class SendFileResponseExtensionsTests
+    public class SendFileTests
     {
-        [Fact]
-        public Task SendFileWhenFileNotFoundThrows()
-        {
-            var response = new DefaultHttpContext().Response;
-            return Assert.ThrowsAsync<FileNotFoundException>(() => response.SendFileAsync("foo"));
-        }
-
         [Fact]
         public async Task SendFileWorks()
         {
@@ -27,7 +21,8 @@ public async Task SendFileWorks()
             var fakeFeature = new FakeSendFileFeature();
             context.Features.Set<IHttpSendFileFeature>(fakeFeature);
 
-            await response.SendFileAsync("bob", 1, 3, CancellationToken.None);
+            var fileInfo = new FakeFileInfo("bob");
+            await response.SendFileAsync(fileInfo, 1, 3, CancellationToken.None);
 
             Assert.Equal("bob", fakeFeature.name);
             Assert.Equal(1, fakeFeature.offset);
@@ -51,5 +46,28 @@ public Task SendFileAsync(string path, long offset, long? length, CancellationTo
                 return Task.FromResult(0);
             }
         }
+
+        private class FakeFileInfo : IFileInfo
+        {
+            public FakeFileInfo(string name, bool exists = true)
+            {
+                Name = name;
+                Exists = exists;
+            }
+
+            public Stream CreateReadStream() => new MemoryStream();
+
+            public bool Exists { get; }
+
+            public long Length => 0;
+
+            public string PhysicalPath => Name;
+
+            public string Name { get; }
+
+            public DateTimeOffset LastModified => DateTimeOffset.UtcNow;
+
+            public bool IsDirectory => false;
+        }
     }
 }