Merge pull request #230 from qiniu/features/add-restore-api

add restore api

Author: Mei-Zhao

src/Qiniu/Storage/BucketManager.cs

@@ -308,7 +308,7 @@ public HttpResult ChangeMime(string bucket, string key, string mimeType)
         /// </summary>
         /// <param name="bucket">空间名称</param>
         /// <param name="key">文件key</param>
-        /// <param name="fileType">修改后的文件存储类型，0表示普通存储，1表示低频存储</param>
+        /// <param name="fileType">修改后的文件存储类型，0表示普通存储，1表示低频存储，2表示归档存储，3表示深度归档存储</param>
         /// <returns>状态码为200时表示OK</returns>
         public HttpResult ChangeType(string bucket, string key, int fileType)
         {
@@ -342,6 +342,39 @@ public HttpResult ChangeType(string bucket, string key, int fileType)
             return result;
         }
 
+        public HttpResult RestoreAr(string bucket, string key, int freezeAfterDays)
+        {
+            HttpResult result = new HttpResult();
+
+            try
+            {
+                string restoreUrl = string.Format("{0}{1}",
+                    this.config.RsHost(this.mac.AccessKey, bucket),
+                    RestoreArOp(bucket, key, freezeAfterDays));
+                string token = auth.CreateManageToken(restoreUrl);
+                result = httpManager.Post(restoreUrl, token);
+            }
+            catch (QiniuException ex)
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.AppendFormat("[{0}] [restore] Error:  ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+                sb.AppendLine();
+
+                result.Code = ex.HttpResult.Code;
+                result.RefCode = ex.HttpResult.Code;
+                result.Text = ex.HttpResult.Text;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// 批处理
         /// </summary>
@@ -753,6 +786,20 @@ public string ChangeTypeOp(string bucket, string key, int fileType)
                 fileType);
         }
 
+        /// <summary>
+        /// 生成chtype操作字符串
+        /// </summary>
+        /// <param name="bucket">空间名称</param>
+        /// <param name="key">文件key</param>
+        /// <param name="freezeAfterDays">修改后文件类型</param>
+        /// <returns>chtype操作字符串</returns>
+        public string RestoreArOp(string bucket, string key, int freezeAfterDays)
+        {
+            return string.Format("/restoreAr/{0}/freezeAfterDays/{1}",
+                Base64.UrlSafeBase64Encode(bucket, key),
+                freezeAfterDays);
+        }
+
         /// <summary>
         /// 生成fetch操作字符串
         /// </summary>

src/Qiniu/Storage/PutPolicy.cs

@@ -135,7 +135,7 @@ public class PutPolicy
         public int? DeleteAfterDays { get; set; }
 
         /// <summary>
-        /// [可选]文件的存储类型，默认为普通存储，设置为1为低频存储
+        /// [可选]文件的存储类型，默认为普通存储，设置为：0 标准存储（默认），1 低频存储，2 归档存储，3 深度归档存储
         /// </summary>
         [JsonProperty("fileType", NullValueHandling = NullValueHandling.Ignore)]
         public int? FileType { get; set; }

src/QiniuTests/Storage/BucketManagerTests.cs

@@ -14,6 +14,7 @@ public void StatTest()
         {
             Config config = new Config();
             config.Zone = Zone.ZONE_CN_East;
+            config.UseHttps = true;
             Mac mac = new Mac(AccessKey, SecretKey);
             BucketManager bucketManager = new BucketManager(mac, config);
             string key = "qiniu.png";
@@ -114,6 +115,64 @@ public void ChangeTypeTest()
             Console.WriteLine(ret.ToString());
         }
 
+        [Test]
+        public void RestoreArArchiveTest()
+        {
+            Config config = new Config();
+            config.Zone = Zone.ZONE_CN_East;
+            Mac mac = new Mac(AccessKey, SecretKey);
+            BucketManager bucketManager = new BucketManager(mac, config);
+
+            string newKey = "qiniu-archive-to-restore.png";
+            HttpResult copyRet = bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
+            if (copyRet.Code != (int)HttpCode.OK)
+            {
+                Assert.Fail("copy error: " + copyRet.ToString());
+            }
+            Console.WriteLine(copyRet.ToString());
+            
+            HttpResult changeTypeRet = bucketManager.ChangeType(Bucket, newKey, 2);
+            if (changeTypeRet.Code != (int)HttpCode.OK && !changeTypeRet.Text.Contains("already in line stat"))
+            {
+                Assert.Fail("change type error: " + changeTypeRet.ToString());
+            }
+
+            HttpResult ret = bucketManager.RestoreAr(Bucket, newKey, 2);
+            if (ret.Code != (int)HttpCode.OK && !ret.Text.Contains("already in line stat"))
+            {
+                Assert.Fail("change type error: " + ret.ToString());
+            }
+        }
+
+        [Test]
+        public void RestoreArDeepArchiveTest()
+        {
+            Config config = new Config();
+            config.Zone = Zone.ZONE_CN_East;
+            Mac mac = new Mac(AccessKey, SecretKey);
+            BucketManager bucketManager = new BucketManager(mac, config);
+
+            string newKey = "qiniu-deep-archive-to-restore.png";
+            HttpResult copyRet = bucketManager.Copy(Bucket, "qiniu.png", Bucket, newKey, true);
+            if (copyRet.Code != (int)HttpCode.OK)
+            {
+                Assert.Fail("copy error: " + copyRet.ToString());
+            }
+            Console.WriteLine(copyRet.ToString());
+            
+            HttpResult changeTypeRet = bucketManager.ChangeType(Bucket, newKey, 3);
+            if (changeTypeRet.Code != (int)HttpCode.OK && !changeTypeRet.Text.Contains("already in line stat"))
+            {
+                Assert.Fail("change type error: " + changeTypeRet.ToString());
+            }
+
+            HttpResult ret = bucketManager.RestoreAr(Bucket, newKey, 2);
+            if (ret.Code != (int)HttpCode.OK && !ret.Text.Contains("already in line stat"))
+            {
+                Assert.Fail("change type error: " + ret.ToString());
+            }
+        }
+
         [Test]
         public void DeleteAfterDaysTest()
         {

src/QiniuTests/Storage/OperationManagerTests.cs

@@ -22,6 +22,7 @@ public void PfopTest()
             string fops = string.Join(";", new string[] { avthumbMp4Fop, vframeJpgFop });
             Mac mac = new Mac(AccessKey, SecretKey);
             Config config = new Config();
+            config.UseHttps = true;
             OperationManager manager = new OperationManager(mac, config);
             string pipeline = "sdktest";
             string notifyUrl = "http://api.example.com/qiniu/pfop/notify";