Expose Name property on IFormFile

Author: khellang

src/Microsoft.AspNet.Http.Abstractions/IFormFile.cs

@@ -18,6 +18,8 @@ public interface IFormFile
 
         long Length { get; }
 
+        string Name { get; }
+
         Stream OpenReadStream();
     }
 }

src/Microsoft.AspNet.Http/Features/FormFeature.cs

@@ -149,7 +149,9 @@ private async Task<IFormCollection> InnerReadFormAsync(CancellationToken cancell
                             // Find the end
                             await section.Body.DrainAsync(cancellationToken);
 
-                            var file = new FormFile(_request.Body, section.BaseStreamOffset.Value, section.Body.Length)
+                            var name = HeaderUtilities.RemoveQuotes(contentDisposition.Name);
+
+                            var file = new FormFile(_request.Body, section.BaseStreamOffset.Value, section.Body.Length, name)
                             {
                                 Headers = new HeaderDictionary(section.Headers),
                             };

src/Microsoft.AspNet.Http/Features/FormFile.cs

@@ -8,15 +8,15 @@ namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class FormFile : IFormFile
     {
-        private Stream _baseStream;
-        private long _baseStreamOffset;
-        private long _length;
+        private readonly Stream _baseStream;
+        private readonly long _baseStreamOffset;
 
-        public FormFile(Stream baseStream, long baseStreamOffset, long length)
+        public FormFile(Stream baseStream, long baseStreamOffset, long length, string name)
         {
             _baseStream = baseStream;
             _baseStreamOffset = baseStreamOffset;
-            _length = length;
+            Length = length;
+            Name = name;
         }
 
         public string ContentDisposition
@@ -33,14 +33,13 @@ public string ContentType
 
         public IHeaderDictionary Headers { get; set; }
 
-        public long Length
-        {
-            get { return _length; }
-        }
+        public long Length { get; }
+
+        public string Name { get; }
 
         public Stream OpenReadStream()
         {
-            return new ReferenceReadStream(_baseStream, _baseStreamOffset, _length);
+            return new ReferenceReadStream(_baseStream, _baseStreamOffset, Length);
         }
     }
 }

src/Microsoft.AspNet.Http/FormFileCollection.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Http.Internal
 {
@@ -15,20 +14,12 @@ public IFormFile this[string name]
 
         public IFormFile GetFile(string name)
         {
-            return Find(file => string.Equals(name, GetName(file.ContentDisposition)));
+            return Find(file => string.Equals(name, file.Name));
         }
 
         public IReadOnlyList<IFormFile> GetFiles(string name)
         {
-            return FindAll(file => string.Equals(name, GetName(file.ContentDisposition)));
-        }
-
-        private static string GetName(string contentDisposition)
-        {
-            // Content-Disposition: form-data; name="myfile1"; filename="Misc 002.jpg"
-            ContentDispositionHeaderValue cd;
-            ContentDispositionHeaderValue.TryParse(contentDisposition, out cd);
-            return HeaderUtilities.RemoveQuotes(cd?.Name);
+            return FindAll(file => string.Equals(name, file.Name));
         }
     }
 }