Merge branch 'RTLcoil-features/new-features'

Author: Amir Tocker

Cloudinary.Test/CloudinaryTest.cs

@@ -587,13 +587,28 @@ public void TestUploadLargeRawFiles()
             // support uploading large raw files
 
             var largeFilePath = m_testPdfPath;
-
+            int fileLength = (int)new FileInfo(largeFilePath).Length;
             var result = m_cloudinary.UploadLargeRaw(new BasicRawUploadParams()
             {
                 File = new FileDescription(largeFilePath)
             });
 
-            Assert.AreEqual(new FileInfo(largeFilePath).Length, result.Length);
+            Assert.AreEqual(fileLength, result.Length);
+        }
+
+        [Test]
+        public void TestUploadLarge()
+        {
+            // support uploading large image
+
+            var largeFilePath = m_testImagePath;
+            int fileLength = (int)new FileInfo(largeFilePath).Length;
+            var result = m_cloudinary.UploadLarge(new BasicRawUploadParams()
+            {
+                File = new FileDescription(largeFilePath)
+            }) as ImageUploadResult;
+
+            Assert.AreEqual(fileLength, result.Length);
         }
 
         [Test]

Cloudinary/Actions/RawUploadParams.cs

@@ -208,16 +208,20 @@ public class FileDescription
         internal bool EOF = false;
         internal int BytesSent = 0;
 
-        internal bool IsLastPart()
+        internal long GetFileLength()
         {
             long len = 0;
 
             if (m_stream != null)
                 len = m_stream.Length;
             else
                 len = new FileInfo(m_path).Length;
+            return len;
+        }
 
-            return len - BytesSent <= BufferLength;
+        internal bool IsLastPart()
+        {
+            return GetFileLength() - BytesSent <= BufferLength;
         }
 
         /// <summary>

Cloudinary/Api.cs

@@ -64,7 +64,7 @@ static Api()
         /// Assumes that environment variable CLOUDINARY_URL is set.
         /// </summary>
         public Api()
-            : this(Environment.GetEnvironmentVariable("CLOUDINARY_URL")) { }
+            : this(Environment.GetEnvironmentVariable("CLOUDINARY_URL")) { }
 
         /// <summary>
         /// Parameterized constructor
@@ -302,7 +302,7 @@ public static T ParseCloudinaryParam<T>(string s)
         /// <param name="parameters">Dictionary of call parameters (can be null)</param>
         /// <param name="file">File to upload (must be null for non-uploading actions)</param>
         /// <returns>HTTP response on call</returns>
-        public HttpWebResponse Call(HttpMethod method, string url, SortedDictionary<string, object> parameters, FileDescription file)
+        public HttpWebResponse Call(HttpMethod method, string url, SortedDictionary<string, object> parameters, FileDescription file, Dictionary<string, string> extraHeaders = null)
         {
 #if DEBUG
             Console.WriteLine(String.Format("{0} REQUEST:", method));
@@ -311,7 +311,6 @@ public HttpWebResponse Call(HttpMethod method, string url, SortedDictionary<stri
 
             HttpWebRequest request = RequestBuilder(url);
             request.Method = Enum.GetName(typeof(HttpMethod), method);
-
             // Add platform information to the USER_AGENT header
             // This is intended for platform information and not individual applications!
             request.UserAgent = string.IsNullOrEmpty(UserPlatform)
@@ -322,10 +321,16 @@ public HttpWebResponse Call(HttpMethod method, string url, SortedDictionary<stri
             {
                 request.Timeout = Timeout;
             }
-
             byte[] authBytes = Encoding.ASCII.GetBytes(String.Format("{0}:{1}", Account.ApiKey, Account.ApiSecret));
             request.Headers.Add("Authorization", String.Format("Basic {0}", Convert.ToBase64String(authBytes)));
 
+            if (extraHeaders != null)
+            {
+                foreach (var header in extraHeaders)
+                {
+                    request.Headers[header.Key] = header.Value;
+                }
+            }
             if ((method == HttpMethod.POST || method == HttpMethod.PUT) && parameters != null)
             {
                 if (UseChunkedEncoding)