add force

Author: liangchaoboy

qiniu/rs.js

@@ -50,6 +50,15 @@ Client.prototype.move = function(bucketSrc, keySrc, bucketDest, keyDest, onret)
   rpc.postWithoutForm(uri, digest, onret);
 }
 
+Client.prototype.forceMove = function(bucketSrc, keySrc, bucketDest, keyDest, force, onret) {
+  
+  var encodedEntryURISrc = getEncodedEntryUri(bucketSrc, keySrc);
+  var encodedEntryURIDest = getEncodedEntryUri(bucketDest, keyDest);
+  var uri = conf.RS_HOST + '/move/' + encodedEntryURISrc + '/' + encodedEntryURIDest +'/force/'+force;  
+  var digest = util.generateAccessToken(uri, null);
+  rpc.postWithoutForm(uri, digest, onret);
+}
+
 Client.prototype.copy = function(bucketSrc, keySrc, bucketDest, keyDest, onret) {
   var encodedEntryURISrc = getEncodedEntryUri(bucketSrc, keySrc);
   var encodedEntryURIDest = getEncodedEntryUri(bucketDest, keyDest);
@@ -58,6 +67,16 @@ Client.prototype.copy = function(bucketSrc, keySrc, bucketDest, keyDest, onret)
   rpc.postWithoutForm(uri, digest, onret);
 }
 
+Client.prototype.forceCopy = function(bucketSrc, keySrc, bucketDest, keyDest, force, onret) {
+  
+    var encodedEntryURISrc = getEncodedEntryUri(bucketSrc, keySrc);
+    var encodedEntryURIDest = getEncodedEntryUri(bucketDest, keyDest);
+    var uri = conf.RS_HOST + '/copy/' + encodedEntryURISrc + '/' + encodedEntryURIDest +'/force/'+force;
+    var digest = util.generateAccessToken(uri, null);
+    rpc.postWithoutForm(uri, digest, onret);
+}
+
+
 Client.prototype.fetch = function(url, bucket, key, onret) {
   var bucketUri = getEncodedEntryUri(bucket, key);
   var fetchUrl = util.urlsafeBase64Encode(url);
@@ -94,8 +113,15 @@ function EntryPathPair(src, dest) {
   this.dest = dest || null;
 }
 
-EntryPathPair.prototype.toStr = function(op) {
-  return 'op=/' + op + '/' + this.src.encode() + '/' + this.dest.encode() + '&';
+EntryPathPair.prototype.toStr = function(op, force) {
+  if(typeof(force)=='undefined'){
+
+    return 'op=/' + op + '/' + this.src.encode() + '/' + this.dest.encode() + '&';
+
+  }else{
+
+    return 'op=/' + op + '/' + this.src.encode() + '/' + this.dest.encode() + '/force/' + force + '&';
+  }
 }
 
 function BatchItemRet(error, code) {
@@ -121,10 +147,23 @@ Client.prototype.batchMove = function(entries, onret) {
   fileHandle('move', entries, onret);
 }
 
+Client.prototype.forceBatchMove = function(entries, force, onret) {
+  
+  fileHandleForce('move', entries, force, onret);
+
+}
+
 Client.prototype.batchCopy = function(entries, onret) {
   fileHandle('copy', entries, onret);
 }
 
+Client.prototype.forceBatchCopy = function(entries, force, onret) {
+  
+  fileHandleForce('copy', entries, force, onret);
+  
+}
+
+
 function fileHandle(op, entries, onret) {
   var body = '';
   for (var i in entries) {
@@ -136,6 +175,18 @@ function fileHandle(op, entries, onret) {
   rpc.postWithForm(uri, body, digest, onret);
 }
 
+function fileHandleForce(op, entries, force, onret) {
+  var body = '';
+  for (var i in entries) {
+    body += entries[i].toStr(op, force);
+  }
+
+  console.log(body);
+  var uri = conf.RS_HOST + '/batch';
+  var digest = util.generateAccessToken(uri, body);
+  rpc.postWithForm(uri, body, digest, onret);
+}
+
 function getEncodedEntryUri(bucket, key) {
   return util.urlsafeBase64Encode(bucket + (key ? ':' + key : ''));
 }

test/rs.test.js

@@ -57,6 +57,16 @@ describe('test start step2:', function() {
         });
       });
 
+      describe('rs.Client#forceCopy()', function() {
+        it('copy logo.png to logo1.png', function(done) {
+          client.forceCopy(TEST_BUCKET, logo, TEST_BUCKET, logo1, 1, function(err, ret) {
+            should.not.exist(err);
+            done();
+          });
+        });
+      });
+
+
       describe('rs.Client#remove()', function() {
         it('remove logo.png', function(done) {
           client.remove(TEST_BUCKET, logo, function(err, ret) {
@@ -74,6 +84,15 @@ describe('test start step2:', function() {
           });
         });
       });
+
+      describe('rs.Client#forceMove()', function() {
+        it('move logo1.png to logo.png', function(done) {
+          client.forceMove(TEST_BUCKET, logo1, TEST_BUCKET, logo, 1, function(err, ret) {
+            should.not.exist(err);
+            done();
+          });
+        });
+      });
     });
 
     describe('batch file handle', function() {
@@ -141,6 +160,20 @@ describe('test start step2:', function() {
         });
       });
 
+      describe('rs.Client#forceBatchCopy', function() {
+        var entries = [];
+        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo), new EntryPath(TEST_BUCKET, logo1)));
+        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo2), new EntryPath(TEST_BUCKET, logo3)));
+
+        it('copy from logo, logo2 to logo1, logo3', function(done) {
+          client.forceBatchCopy(entries, 1, function(err, ret) {
+            should.not.exist(err);
+            ret.should.eql([ { code: 200 }, { code: 200 } ]);
+            done();
+          });
+        });
+      });
+
       describe('rs.Client#batchDelete', function() {
         var entries = [new EntryPath(TEST_BUCKET, logo), new EntryPath(TEST_BUCKET, logo2)];
 
@@ -164,6 +197,20 @@ describe('test start step2:', function() {
           });
         });
       });
+
+      describe('rs.Client#forceBatchMove', function() {
+        var entries = [];
+        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo1), new EntryPath(TEST_BUCKET, logo)));
+        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo3), new EntryPath(TEST_BUCKET, logo2)));
+
+        it('move from logo1.png, logo3.png to logo.png, logo2.png', function(done) {
+          client.forceBatchMove(entries, 1, function(err, ret) {
+            should.not.exist(err);
+            done();
+          });
+        });
+      });
+
     });
 
     describe('rs.isQiniuCallBack', function() {