From 951aa784b071151cc92f6918f357d79bb50f75ad Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Thu, 19 Aug 2021 12:28:10 +0200 Subject: Fix folder size contained in S3 buckets If 'filesystem_check_changes' was set to never, the cached size was alway set to -1 (Pending) on every access Signed-off-by: Louis Chemineau --- apps/files_external/lib/Lib/Storage/AmazonS3.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'apps/files_external') diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 32e74250a91..220822f9396 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -384,13 +384,14 @@ class AmazonS3 extends \OC\Files\Storage\Common { try { $stat = []; if ($this->is_dir($path)) { - //folders don't really exist - $stat['size'] = -1; //unknown - $stat['mtime'] = time(); $cacheEntry = $this->getCache()->get($path); - if ($cacheEntry instanceof CacheEntry && $this->getMountOption('filesystem_check_changes', 1) !== 1) { + if ($cacheEntry instanceof CacheEntry) { $stat['size'] = $cacheEntry->getSize(); $stat['mtime'] = $cacheEntry->getMTime(); + } else { + // Use dummy values + $stat['size'] = -1; // Pending + $stat['mtime'] = time(); } } else { $stat['size'] = $this->getContentLength($path); @@ -405,6 +406,10 @@ class AmazonS3 extends \OC\Files\Storage\Common { } } + public function hasUpdated($path, $time) { + return $this->getMountOption('filesystem_check_changes', 1) === 1 || parent::hasUpdated($path, $time); + } + /** * Return content length for object * -- cgit v1.2.3