Merge pull request #18 from xushiwei/feature/rsf_batch

rsf+batch

Author: xushiwei

qiniu/rs.php

@@ -190,6 +190,7 @@ function Qiniu_RS_Batch($self, $ops) // => ($data, $error)
 
 function Qiniu_RS_BatchStat($self, $entryPaths)
 {
+	$params = array();
 	foreach ($entryPaths as $entryPath) {
 		$params[] = Qiniu_RS_URIStat($entryPath->bucket, $entryPath->key);
 	}
@@ -198,6 +199,7 @@ function Qiniu_RS_BatchStat($self, $entryPaths)
 
 function Qiniu_RS_BatchDelete($self, $entryPaths)
 {
+	$params = array();
 	foreach ($entryPaths as $entryPath) {
 		$params[] = Qiniu_RS_URIDelete($entryPath->bucket, $entryPath->key);
 	}
@@ -206,16 +208,22 @@ function Qiniu_RS_BatchDelete($self, $entryPaths)
 
 function Qiniu_RS_BatchMove($self, $entryPairs)
 {
+	$params = array();
 	foreach ($entryPairs as $entryPair) {
-		$params[] = Qiniu_RS_URIMove($entryPair->src->bucket, $entryPair->src->key, $entryPair->dest->bucket, $entryPair->dest->key);
+		$src = $entryPair->src;
+		$dest = $entryPair->dest;
+		$params[] = Qiniu_RS_URIMove($src->bucket, $src->key, $dest->bucket, $dest->key);
 	}
 	return Qiniu_RS_Batch($self, $params);
 }
 
 function Qiniu_RS_BatchCopy($self, $entryPairs)
 {
+	$params = array();
 	foreach ($entryPairs as $entryPair) {
-		$params[] = Qiniu_RS_URICopy($entryPair->src->bucket, $entryPair->src->key, $entryPair->dest->bucket, $entryPair->dest->key);
+		$src = $entryPair->src;
+		$dest = $entryPair->dest;
+		$params[] = Qiniu_RS_URICopy($src->bucket, $src->key, $dest->bucket, $dest->key);
 	}
 	return Qiniu_RS_Batch($self, $params);
 }

qiniu/rsf.php

@@ -2,36 +2,42 @@
 
 require_once("http.php");
 
+define('Qiniu_RSF_EOF', 'EOF');
+
 /**
  * 1. 首次请求 marker = ""
  * 2. 无论 err 值如何，均应该先看 items 是否有内容
  * 3. 如果后续没有更多数据，err 返回 EOF，markerOut 返回 ""（但不通过该特征来判断是否结束）
  */
-function Qiniu_RSF_ListPrefix($self, $bucket, $prefix, $marker, $limit) // => ($items, $markerOut, $err)
+function Qiniu_RSF_ListPrefix(
+	$self, $bucket, $prefix = '', $marker = '', $limit = 0) // => ($items, $markerOut, $err)
 {
 	global $QINIU_RSF_HOST;
-	$query = array("bucket" => $bucket);
+
+	$query = array('bucket' => $bucket);
 	if (!empty($prefix)) {
-		$query["prefix"] = $prefix;
+		$query['prefix'] = $prefix;
 	}
 	if (!empty($marker)) {
-		$query["marker"] = $marker;
+		$query['marker'] = $marker;
 	}
 	if (!empty($limit)) {
-		$query["limit"] = $limit;
+		$query['limit'] = $limit;
 	}
 
-	$url =  $QINIU_RSF_HOST . "/list?" . http_build_query($query);
+	$url =  $QINIU_RSF_HOST . '/list?' . http_build_query($query);
 	list($ret, $err) = Qiniu_Client_Call($self, $url);
+	if ($err !== null) {
+		return array(null, '', $err);
+	}
 
 	$items = $ret['items'];
-	if (!isset($ret['marker'])) {
+	if (empty($ret['marker'])) {
 		$markerOut = '';
-		$err = new Qiniu_Error(400, 'EOF');
+		$err = Qiniu_RSF_EOF;
 	} else {
 		$markerOut = $ret['marker'];
 	}
-
 	return array($items, $markerOut, $err);
 }
 

tests/RsfTest.php

@@ -18,14 +18,14 @@ public function setUp()
 	public function testListPrefix()
 	{
 		echo $this->bucket;
-		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, null, null, null);
-		$this->assertEquals($err->Err, 'EOF');
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket);
+		$this->assertEquals($err, Qiniu_RSF_EOF);
 		$this->assertEquals($markerOut, '');
 
-		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, null, null, 1);
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, '', '', 1);
 		$this->assertFalse($markerOut === '');
 
-		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, $this->key, null, null);
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, $this->key);
 		$this->assertLessThanOrEqual(1, count($items));
 	}
 }