Merge pull request #16 from rwifeng/rsf

Rsf

Author: xushiwei

qiniu/rsf.php

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

tests/RsfTest.php

@@ -0,0 +1,31 @@
+<?php
+
+require_once("bootstrap.php");
+
+class RsfTest extends PHPUnit_Framework_TestCase
+{
+	public $client;
+	public $bucket;
+
+	public function setUp()
+	{
+		initKeys();
+		$this->client = new Qiniu_MacHttpClient(null);
+		$this->bucket = getenv('QINIU_BUCKET_NAME');
+		$this->key = getenv('QINIU_KEY_NAME');
+	}
+
+	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');
+		$this->assertEquals($markerOut, '');
+
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, null, null, 1);
+		$this->assertFalse($markerOut === '');
+
+		list($items, $markerOut, $err) = Qiniu_RSF_ListPrefix($this->client, $this->bucket, $this->key, null, null);
+		$this->assertLessThanOrEqual(1, count($items));
+	}
+}

tests/bootstrap.php

@@ -2,6 +2,7 @@
 
 require_once("../qiniu/fop.php");
 require_once("../qiniu/rs_utils.php");
+require_once("../qiniu/rsf.php");
 
 $accessKey = getenv("QINIU_ACCESS_KEY");
 $secretKey = getenv("QINIU_SECRET_KEY");