merge streaming-attachments branch

1 files changed, 9 insertions, 1 deletions

diff --git a/SendGrid/SendGridMail/Transport/Web.cs b/SendGrid/SendGridMail/Transport/Web.cs
index 885f482..5a27469 100755
--- a/SendGrid/SendGridMail/Transport/Web.cs
+++ b/SendGrid/SendGridMail/Transport/Web.cs
@@ -84,8 +84,11 @@ namespace SendGridMail.Transport
 

         private void AttachFiles(ISendGrid message, MultipartEntity multipartEntity)

         {

-            var files = FetchFileBodies(message);

+            var files = FetchFileBodies(message);
             files.ForEach(kvp => multipartEntity.AddBody(new FileBody("files[" + Path.GetFileName(kvp.Key) + "]", Path.GetFileName(kvp.Key), kvp.Value)));

+

+            var streamingFiles = FetchStreamingFileBodies(message);

+            streamingFiles.ForEach(kvp => multipartEntity.AddBody(new StreamedFileBody(kvp.Value, kvp.Key)));
         }

 

         private void CheckForErrors(CodeScales.Http.Methods.HttpResponse response)

@@ -148,6 +151,11 @@ namespace SendGridMail.Transport
             }

             return result.Where(r => !String.IsNullOrEmpty(r.Value)).ToList();

         }

+        

+        internal List<KeyValuePair<String, MemoryStream>> FetchStreamingFileBodies(ISendGrid message)

+        {

+            return message.StreamedAttachments.Select(kvp => kvp).ToList();

+        }

 

         internal List<KeyValuePair<String, FileInfo>> FetchFileBodies(ISendGrid message)

         {