fix

Author: icattlecoder

demo/Program.cs

@@ -11,31 +11,32 @@ class MainClass
 		public static void Main (string[] args)
 		{
 			// 初始化qiniu配置，主要是API Keys
-			qiniu.Config.ACCESS_KEY = "IT9iP3J9wdXXYsT1p8ns0gWD-CQOdLvIQuyE0FOK";
+			qiniu.Config.ACCESS_KEY = "IT9iP3J9wdXXYsT1p8ns0gWD-CQOdLvIQuyE0FOi";
 			qiniu.Config.SECRET_KEY = "zUCzekBtEqTZ4-WJPCGlBrr2PeyYxsYn98LPaivM";
 
 			/**********************************************************************
 			可以用下面的方法从配置文件中初始化
 			qiniu.Config.InitFromAppConfig ();
 			**********************************************************************/
 
-
-				string localfile = "/Users/icattlecoder/Movies/tzd.rmvb";
-				string bucket = "icattlecoder";
-				string qiniukey = "tzd.rmvb";
+			string localfile = "/Users/icattlecoder/Movies/tzd.rmvb";
+			string bucket = "icattlecoder";
+			string qiniukey = "tzd.rmvb";
+			
 			//======================================================================
 			{
 				QiniuFile qfile = new QiniuFile (bucket, qiniukey, localfile);
-				ResumbalePutEx puttedCtx = new ResumbalePutEx (localfile);
+				ResumbleUploadEx puttedCtx = new ResumbleUploadEx (localfile);
 				ManualResetEvent done = new ManualResetEvent (false);
 				qfile.UploadCompleted += (sender, e) => {
-					Console.WriteLine (e.RawString);
+					Console.WriteLine (e.key);
+					Console.WriteLine (e.Hash);
 					done.Set ();
 				};
 				qfile.UploadFailed += (sender, e) => {
 					Console.WriteLine (e.Error.ToString ());
-					done.Set ();
 					puttedCtx.Save();
+					done.Set ();
 				};
 				qfile.UploadProgressChanged += (sender, e) => {
 					int percentage = (int)(100 * e.BytesSent / e.TotalBytes);
@@ -45,7 +46,12 @@ public static void Main (string[] args)
 					puttedCtx.Add(e.Index,e.Ctx);
 					puttedCtx.Save();
 				};
-				// 上传为异步操作
+				qfile.UploadBlockFailed += (sender, e) => {
+					//
+
+				};
+
+				//上传为异步操作
 				//上传本地文件到七牛云存储
 				qfile.Upload (puttedCtx.PuttedCtx);
 				done.WaitOne ();
@@ -58,8 +64,9 @@ public static void Main (string[] args)
 					QiniuFile qfile = new QiniuFile (bucket, qiniukey);
 					QiniuFileInfo finfo = qfile.Stat ();
 					if (finfo != null) {
+						qfile.Move("cloudcomment","movetest");
 						//删除七牛云空间的文件
-						qfile.Delete ();
+						//qfile.Delete ();
 					}
 				} catch (QiniuWebException e) {
 					Console.WriteLine (e.Error.HttpCode);

demo/demo.csproj

@@ -34,7 +34,6 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QiniuResumbleHelper.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

sdk/QiniuConf.cs

@@ -44,13 +44,8 @@ public class Config
 		/// </summary>
 		public static void InitFromAppConfig()
 		{
-			USER_AGENT = System.Configuration.ConfigurationManager.AppSettings["USER_AGENT"];
 			ACCESS_KEY = System.Configuration.ConfigurationManager.AppSettings["ACCESS_KEY"];
 			SECRET_KEY = System.Configuration.ConfigurationManager.AppSettings["SECRET_KEY"];
-			RS_HOST = System.Configuration.ConfigurationManager.AppSettings["RS_HOST"];
-			UP_HOST = System.Configuration.ConfigurationManager.AppSettings["UP_HOST"];
-			RSF_HOST = System.Configuration.ConfigurationManager.AppSettings["RSF_HOST"];
-			PREFETCH_HOST = System.Configuration.ConfigurationManager.AppSettings["PREFETCH_HOST"];
 		}
 	}
 }

sdk/QiniuFile.cs

@@ -155,7 +155,34 @@ public bool Delete(MAC mac=null){
 			} catch (Exception e) {
 				throw e;
 			}
-		}	
+		}
+
+		/// <summary>
+		/// Move the specified destBucket, destKey and mac.
+		/// </summary>
+		/// <param name="destBucket">Destination bucket.</param>
+		/// <param name="destKey">Destination key.</param>
+		/// <param name="mac">Mac.</param>
+		public bool Move(string destBucket,string destKey,MAC mac=null){
+			if (mac == null) {
+				mac = new MAC ();
+			}
+			string url = string.Format ("{0}/{1}/{2}/{3}",
+				Config.RS_HOST,
+				"move",
+				Base64URLSafe.Encode (this.bucketName+":"+this.key),
+				Base64URLSafe.Encode (destBucket+":"+destKey));
+			try {
+				using (QiniuWebClient client = new QiniuWebClient ()) {
+					client.Call (url, mac);
+					return true;
+				}
+			} catch (WebException e) {
+				throw new QiniuWebException(e);
+			} catch (Exception e) {
+				throw e;
+			}
+		}
 
 		/// <summary>
 		/// Asyncs the upload.
@@ -242,6 +269,7 @@ private void uploadBigFile(string token,BlkputRet[] puttedBlk=null){
 					for (int i = 0; i < blockcount; i++) {
 						if (puttedBlk!=null&&i< puttedBlk.Length) {
 							blkRets[i] = puttedBlk[i];
+							totalSent +=(long)blkRets[i].offset;
 							continue;
 						}
 						if (i == blockcount - 1) {
@@ -346,8 +374,6 @@ private static string getDefalutToken(string bucketName,string key){
 			return policy.Token ();
 		}
 		#endregion
-
-	
 	}
 
 	[JsonObject(MemberSerialization.OptIn)]

demo/QiniuResumbleHelper.cs renamed to sdk/QiniuResumbleUploadEx.cs

@@ -1,21 +1,23 @@
 using System;
+using System.IO;
 using System.Text;
-using System.Collections.Generic;
 using System.Security.Cryptography;
-using System.IO;
-using System.IO.Compression;
-using qiniu;
-namespace demo
+using System.Collections.Generic;
+
+namespace qiniu
 {
-	public class ResumbalePutEx
+	/// <summary>
+	/// 断点续传.
+	/// </summary>
+	public class ResumbleUploadEx
 	{
 		private string puttedCtxDir;
 		private string fileName;
 		private string puttedCtxFileName;
 		private Dictionary<int,BlkputRet> puttedCtx;
 
 		/// <summary>
-		/// Gets the putted context.
+		/// 获取已上传的结果.
 		/// </summary>
 		/// <value>The putted context.</value>
 		public BlkputRet[] PuttedCtx {
@@ -27,7 +29,7 @@ public BlkputRet[] PuttedCtx {
 					if (this.puttedCtx.ContainsKey (i)) {
 						result [i] = this.puttedCtx [i];
 					} else {
-						this.Delete ();
+						this.Clear ();
 						return null;
 					}
 				}
@@ -39,8 +41,8 @@ public BlkputRet[] PuttedCtx {
 		/// Initializes a new instance of the <see cref="demo.ResumbalePutEx"/> class.
 		/// </summary>
 		/// <param name="filename">Filename.</param>
-		/// <param name="puttedCtxDir">Putted context dir.default set to System TempPath</param>
-		public ResumbalePutEx (string filename, string puttedCtxDir=null){
+		/// <param name="puttedCtxDir">断点续传上传结果持久化存放目录. 默认存放在系统临时文件夹。</param>
+		public ResumbleUploadEx (string filename, string puttedCtxDir=null){
 			if (!File.Exists (filename)) {
 				throw new Exception(string.Format("{0} does not exist", filename));
 			}
@@ -79,7 +81,7 @@ private Dictionary<int,BlkputRet> initloadPuttedCtx(){
 		}
 
 		/// <summary>
-		/// Save this putted result to disk file.
+		/// 保存持久化结果至磁盘文件
 		/// </summary>
 		public void Save(){
 			StringBuilder sb = new StringBuilder ();
@@ -91,7 +93,7 @@ public void Save(){
 		}
 
 		/// <summary>
-		/// 
+		/// 保存持久化结果至内存
 		/// </summary>
 		/// <param name="tempFileName"></param>
 		/// <param name="idx"></param>
@@ -102,7 +104,7 @@ public void Add(int idx, BlkputRet ret)
 		}
 
 		/// <summary>
-		/// Adds the and sync.
+		/// 保存持久化结果至内存和文件.
 		/// </summary>
 		/// <param name="idx">Index.</param>
 		/// <param name="ret">Ret.</param>
@@ -112,9 +114,9 @@ public void AddAndSave(int idx,BlkputRet ret){
 		}
 
 		/// <summary>
-		/// Delete this instance.
+		/// 清除上传持久化结果
 		/// </summary>
-		public void Delete(){
+		public void Clear(){
 			if (File.Exists (this.puttedCtxFileName)) {
 				this.puttedCtx.Clear ();
 				File.Delete (this.puttedCtxFileName);
@@ -138,4 +140,3 @@ private static string getFileBase64Sha1(string filename)
 	}
 }
 
-

sdk/qiniu.csproj

@@ -47,6 +47,7 @@
     <Compile Include="QiniuEventArgs.cs" />
     <Compile Include="QiniuPutPolicy.cs" />
     <Compile Include="QiniuMAC.cs" />
+    <Compile Include="QiniuResumbleUploadEx.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>