Merge pull request #171 from liangchaoboy/listPrefixAddDelimiter

addDelimiter

Author: longbai

qiniu/rsf.js

@@ -2,14 +2,14 @@ var rpc = require('./rpc');
 var conf = require('./conf');
 var util = require('./util');
 
-exports.listPrefix = function(bucket, prefix, marker, limit, onret) {
-  var uri = getPrefixUri(bucket, prefix, marker, limit);
+exports.listPrefix = function(bucket, prefix, marker, limit, delimiter, onret) {
+  var uri = getPrefixUri(bucket, prefix, marker, limit, delimiter);
   var digest = util.generateAccessToken(uri, null);
 
   rpc.postWithoutForm(uri, digest, onret)
 }
 
-function getPrefixUri(bucket, prefix, marker, limit) {
+function getPrefixUri(bucket, prefix, marker, limit, delimiter) {
   var uri = conf.RSF_HOST + '/' + 'list?' + 'bucket=' + bucket;
   if (marker) {
     uri += '&' + 'marker=' + marker;
@@ -22,6 +22,11 @@ function getPrefixUri(bucket, prefix, marker, limit) {
   if (prefix) {
     uri += '&' + 'prefix=' + prefix;
   }
+
+  if(delimiter){
+    uri += '&' + 'delimiter=' + delimiter;
+  }
+
   return uri;
 }
 

test/io.test.js

@@ -138,7 +138,7 @@ describe('test start step1:', function() {
     describe('file handle', function() {
       describe('rsf.listPrefix()', function() {
         it('list all file in test bucket', function(done) {
-          qiniu.rsf.listPrefix(TEST_BUCKET, null, null, null, function(err, ret) {
+          qiniu.rsf.listPrefix(TEST_BUCKET, null, null, null, null, function(err, ret) {
             should.not.exist(err);
 //            ret.data.items.length.should.equal(keys.length);
             for (var i in ret.items) {