mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9529 from helmutschneider/fix-8326 

Fixes #8326: deletion of directories on S3
This commit is contained in:
Robin Appelman 2014-08-01 14:04:21 +02:00
parent 6cbfe8fd98 ac75a24597
commit 4886c8582d
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/files_external/lib/amazons3.php
View File

@ -190,26 +190,17 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return false;
}
$dh = $this->opendir($path);
if(is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
if ($file === '.' || $file === '..') {
continue;
}
if ($this->is_dir($path . '/' . $file)) {
$this->rmdir($path . '/' . $file);
} else {
$this->unlink($path . '/' . $file);
}
}
}
// Since there are no real directories on S3, we need
// to delete all objects prefixed with the path.
$objects = $this->connection->listObjects(array(
'Bucket' => $this->bucket,
'Prefix' => $path . '/'
));
try {
$result = $this->connection->deleteObject(array(
$result = $this->connection->deleteObjects(array(
'Bucket' => $this->bucket,
'Key' => $path . '/'
'Objects' => $objects['Contents']
));
$this->testTimeout();
} catch (S3Exception $e) {
@ -310,6 +301,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
public function unlink($path) {
$path = $this->normalizePath($path);
if ( $this->is_dir($path) ) {
return $this->rmdir($path);
}
try {
$result = $this->connection->deleteObject(array(
'Bucket' => $this->bucket,