update the progress handler

Author: jemygraw

src/Qiniu/Qiniu.csproj

@@ -64,8 +64,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

src/Qiniu/Storage/FormUploader.cs

@@ -76,14 +76,22 @@ public HttpResult UploadData(byte[] data, string key, string token, PutExtra ext
         /// <param name="token">上传凭证</param>
         /// <param name="extra">上传可选设置</param>
         /// <returns>上传数据流后的返回结果</returns>
-        public HttpResult UploadStream(Stream stream, string key, string token, PutExtra extra)
+        public HttpResult UploadStream(Stream stream, string key, string token, PutExtra putExtra)
         {
-            if (extra == null)
+            if (putExtra == null)
             {
-                extra = new PutExtra();
+                putExtra = new PutExtra();
             }
-            if (string.IsNullOrEmpty(extra.MimeType )) {
-                extra.MimeType = "application/octet-stream";
+            if (string.IsNullOrEmpty(putExtra.MimeType )) {
+                putExtra.MimeType = "application/octet-stream";
+            }
+            if (putExtra.ProgressHandler == null)
+            {
+                putExtra.ProgressHandler = DefaultUploadProgressHandler;
+            }
+            if (putExtra.UploadController == null)
+            {
+                putExtra.UploadController = DefaultUploadController;
             }
             string fname = key;
             if (string.IsNullOrEmpty(key))
@@ -115,9 +123,9 @@ public HttpResult UploadStream(Stream stream, string key, string token, PutExtra
                 bodyBuilder.AppendLine("--" + boundary);
 
                 //write extra params
-                if (extra.Params != null && extra.Params.Count > 0)
+                if (putExtra.Params != null && putExtra.Params.Count > 0)
                 {
-                    foreach (var p in extra.Params)
+                    foreach (var p in putExtra.Params)
                     {
                         if (p.Key.StartsWith("x:"))
                         {
@@ -134,6 +142,7 @@ public HttpResult UploadStream(Stream stream, string key, string token, PutExtra
                 int bufferSize = 1024 * 1024;
                 byte[] buffer = new byte[bufferSize];
                 int bytesRead = 0;
+                putExtra.ProgressHandler(0, stream.Length);
                 MemoryStream dataMS = new MemoryStream();
                 while ((bytesRead = stream.Read(buffer, 0, bufferSize)) != 0)
                 {
@@ -149,11 +158,11 @@ public HttpResult UploadStream(Stream stream, string key, string token, PutExtra
                 bodyBuilder.AppendLine("--" + boundary);
 
                 //write fname
-                bodyBuilder.AppendFormat("Content-Disposition: form-data; name=\"file\"; filename=\"{0}\"",fname); 
+                bodyBuilder.AppendFormat("Content-Disposition: form-data; name=\"file\"; filename=\"{0}\"", fname);
                 bodyBuilder.AppendLine();
 
                 //write mime type
-                bodyBuilder.AppendFormat("Content-Type: {0}", extra.MimeType);
+                bodyBuilder.AppendFormat("Content-Type: {0}", putExtra.MimeType);
                 bodyBuilder.AppendLine();
                 bodyBuilder.AppendLine();
 
@@ -180,8 +189,9 @@ public HttpResult UploadStream(Stream stream, string key, string token, PutExtra
                 }
 
                 string uploadHost = this.config.UpHost(ak, bucket);
-
+                putExtra.ProgressHandler(stream.Length / 5, stream.Length);
                 result = httpManager.PostMultipart(uploadHost, ms.ToArray(), boundary, null);
+                putExtra.ProgressHandler(stream.Length, stream.Length);
                 if (result.Code == (int)HttpCode.OK)
                 {
                     result.RefText += string.Format("[{0}] [FormUpload] Uploaded: #STREAM# ==> \"{1}\"\n",
@@ -238,6 +248,32 @@ public HttpResult UploadStream(Stream stream, string key, string token, PutExtra
 
             return result;
         }
+
+        /// <summary>
+        /// 默认的进度处理函数-上传文件
+        /// </summary>
+        /// <param name="uploadedBytes">已上传的字节数</param>
+        /// <param name="totalBytes">文件总字节数</param>
+        public static void DefaultUploadProgressHandler(long uploadedBytes, long totalBytes)
+        {
+            if (uploadedBytes < totalBytes)
+            {
+                Console.WriteLine("[{0}] [FormUpload] Progress: {1,7:0.000}%", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"), 100.0 * uploadedBytes / totalBytes);
+            }
+            else
+            {
+                Console.WriteLine("[{0}] [FormUpload] Progress: {1,7:0.000}%\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"), 100.0);
+            }
+        }
+
+        /// <summary>
+        /// 默认的上传控制函数，默认不执行任何控制
+        /// </summary>
+        /// <returns>控制状态</returns>
+        public static UploadControllerAction DefaultUploadController()
+        {
+            return UploadControllerAction.Activated;
+        }
     }
 
 }

src/Qiniu/Storage/ResumableUploader.cs

@@ -53,14 +53,14 @@ public ResumableUploader(Config config)
         /// <param name="localFile">本地待上传的文件名</param>
         /// <param name="key">要保存的文件名称</param>
         /// <param name="token">上传凭证</param>
-        /// <param name="extra">上传可选配置</param>
+        /// <param name="putExtra">上传可选配置</param>
         /// <returns>上传文件后的返回结果</returns>
-        public HttpResult UploadFile(string localFile, string key, string token, PutExtra extra)
+        public HttpResult UploadFile(string localFile, string key, string token, PutExtra putExtra)
         {
             try
             {
                 FileStream fs = new FileStream(localFile, FileMode.Open);
-                return this.UploadStream(fs, key, token, extra);
+                return this.UploadStream(fs, key, token, putExtra);
             }
             catch (Exception ex)
             {
@@ -684,23 +684,6 @@ public static void DefaultUploadProgressHandler(long uploadedBytes, long totalBy
                 Console.WriteLine("[{0}] [ResumableUpload] Progress: {1,7:0.000}%\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"), 100.0);
             }
         }
-
-        /// <summary>
-        /// 默认的进度处理函数-上传数据流
-        /// </summary>
-        /// <param name="uploadedBytes">已上传的字节数，如果设置为0或负数表示读取完毕</param>
-        public static void DefaultStreamProgressHandler(long uploadedBytes)
-        {
-            if (uploadedBytes > 0)
-            {
-                Console.WriteLine("[{0}] [ResumableUpload] UploadledBytes: {1}", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"), uploadedBytes);
-            }
-            else
-            {
-                Console.WriteLine("[{0}] [ResumableUpload] Done.\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-            }
-        }
-
 
         /// <summary>
         /// 默认的上传控制函数，默认不执行任何控制

src/Qiniu/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net40" />
+  <package id="NUnit" version="3.7.1" targetFramework="net40" />
 </packages>