Merge pull request #2 from aliyun/fix_listContents

fix listContens bug
aliyun · Oct 31, 2017 · 4343770 · 4343770
2 parents baa0249 + 0bea25b
commit 4343770
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/samples/AliyunOssFlysystem.php b/samples/AliyunOssFlysystem.php
@@ -71,7 +71,7 @@
 // 拷贝oss文件
 $filesystem->copy('2.txt', 'test/3.txt');
 
-//
+// 按前缀list, true是递归list出所有文件,false只list当前文件夹的文件
 $result = $filesystem->listContents('', true);
 echo "listContents result: ";
 print_r($result);

diff --git a/src/AliyunOssAdapter.php b/src/AliyunOssAdapter.php
@@ -211,7 +211,7 @@ public function deleteDir($dirname)
             if ($val['type'] === 'file') {
                 $objects[] = $this->applyPathPrefix($val['path']);
             } else {
-                $objects[] = $this->applyPathPrefix($val['path']).'/';
+                $objects[] = $this->applyPathPrefix($val['path']) .'/';
             }
         }
 
@@ -276,6 +276,7 @@ public function read($path)
     public function listContents($directory = '', $recursive = false)
     {
         $directory = $this->applyPathPrefix($directory);
+        $directory = $this->applyPathSeparator($directory);
 
         $bucket = $this->bucket;
         $delimiter = '/';
@@ -461,4 +462,10 @@ protected function doesDirectoryExist($object)
 
 		return $objectList || $prefixList;
     }
+
+    protected function applyPathSeparator($path)
+    {
+        return rtrim($path, '\\/') . '/';
+    }
+
 }
diff --git a/tests/AliyunOssAdapterTest.php b/tests/AliyunOssAdapterTest.php
@@ -281,14 +281,25 @@ public function testListContents()
 		$this->filesystem->write($dir . '/2.txt', '123');
 		$this->filesystem->write($dir . '/3.txt', '123');
 		$this->filesystem->write($dir . '/secondlevel/4.txt', '123');
+		$this->filesystem->write($dir . '/secondlevel/5.txt', '123');
 
-
         $list = $this->filesystem->listContents($dir, true);
-        $this->assertEquals(count($list), 4);
+        $this->assertEquals(count($list), 5);
+
+        $this->assertEquals($list[0]['path'], $dir . '/1.txt');
+        $this->assertEquals($list[1]['path'], $dir . '/2.txt');
+        $this->assertEquals($list[2]['path'], $dir . '/3.txt');
+        $this->assertEquals($list[3]['path'], $dir . '/secondlevel/4.txt');
+        $this->assertEquals($list[4]['path'], $dir . '/secondlevel/5.txt');
 
         $list = $this->filesystem->listContents($dir, false);
-        $this->assertEquals(count($list), 0);
-
+        $this->assertEquals(count($list), 4);
+
+        $this->assertEquals($list[0]['path'], $dir . '/1.txt');
+        $this->assertEquals($list[1]['path'], $dir . '/2.txt');
+        $this->assertEquals($list[2]['path'], $dir . '/3.txt');
+        $this->assertEquals($list[3]['path'], $dir . '/secondlevel');
+
 		$this->filesystem->deleteDir($dir);
 	}