upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

doesDirectoryExist fixes

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2021-10-14 18:36:55 +02:00 committed by backportbot[bot]
parent a4a4097068
commit 804a7090f5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files_external/lib/Lib/Storage/AmazonS3.php
View file

@ -46,7 +46,6 @@ use Icewind\Streams\CallbackWrapper;
use Icewind\Streams\IteratorDirectory;
use OC\Cache\CappedMemoryCache;
use OC\Files\Cache\CacheEntry;
use OC\Files\Filesystem;
use OC\Files\ObjectStore\S3ConnectionTrait;
use OC\Files\ObjectStore\S3ObjectTrait;
use OCP\Constants;
@ -174,6 +173,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
if ($path === '.' || $path === '') {
return true;
}
$path = rtrim($path, '/') . '/';
if (isset($this->directoryCache[$path])) {
return $this->directoryCache[$path];
@ -183,7 +183,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
// Do a prefix listing of objects to determine.
$result = $this->getConnection()->listObjectsV2([
'Bucket' => $this->bucket,
'Prefix' => rtrim($path, '/'),
'Prefix' => $path,
'MaxKeys' => 1,
]);
@ -360,7 +360,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
return IteratorDirectory::wrap(array_map(function (array $item) {
return $item['name'];
}, $content));
} catch (S3Exception $e) {
} catch (S3Exception $e) {
return false;
}
}
@ -435,7 +435,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
try {
return $this->isRoot($path) || $this->doesDirectoryExist($path);
return $this->doesDirectoryExist($path);
} catch (S3Exception $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
return false;