upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

refactor(Storage/S3): add cacheDirectoryExists helper

Browse source 
Signed-off-by: Josh <josh.t.richards@gmail.com>
This commit is contained in:
Josh 2026-03-01 12:07:06 -05:00 committed by GitHub
parent d57b69615c
commit 705e015d11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,8 +164,7 @@ class AmazonS3 extends Common {
$hasPrefixedObjects = !empty($result['Contents']);
if ($hasPrefixedObjects) {
$this->directoryCache[$path] = true;
return true;
return $this->cacheDirectoryExists($path, true);
}
// Check for an object with the exact key ("$path/").
@ -175,35 +174,32 @@ class AmazonS3 extends Common {
// turning off by default (gating it).
$directoryMarker = $this->headObject($path);
if ($directoryMarker) {
$this->directoryCache[$path] = true;
return true;
return $this->cacheDirectoryExists($path, true);
}
$this->directoryCache[$path] = false;
return false;
// Not found
return $this->cacheDirectoryExists($path, false);
} catch (S3Exception $e) {
if ($e->getStatusCode() >= 400 && $e->getStatusCode() < 500) {
// Treat client-side 4xx as non-existing for cache purposes.
// @todo: this may be incorrect; still rethrows 4xx after caching false, but doesn't return false.
$this->directoryCache[$path] = false;
}
throw $e;
}
// CONCERNS/Checklist:
// - Based on ancient version of flysystem
// - helpers to reduce logic duplication and improve clarity
// - general readability (naming, structure, etc.)
// - shared code with other functions
// - similar logic with other functions
// - general robustness
// - handling of different error scenarios from listObjectsV2()
// - handling of non-404s from headObject()
// - necessity / default use of headObject() fallback (performance hit; unnecessary with AWS and probably most others...)
// - Exception handling policy still rethrows 4xx after caching false, but doesn't return false
// - handling of different error scenarios from listObjectsV2()
// - caching interaction (short-lived -- user facing tasks)
// - caching interaction (long-lived -- e.g. scans/non-user tasks)
// - general performance
// - common root checks and path & prefix normalization throughout class
// - common root checks and path & prefix normalization (throughout class)
}
private function cacheDirectoryExists(string $path, bool $exists): bool {
$this->directoryCache[$path] = $exists;
return $exists;
}
protected function remove(string $path): bool {