From 112e2f67475ec61625490cb7fd8c5f992df215f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 7 Jul 2020 10:22:22 +0200 Subject: [PATCH] Reuse cache for directory mtime/size if filesystem changes can be ignored MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files_external/lib/Lib/Storage/AmazonS3.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 641a26b20e..4a49f70dd5 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -45,6 +45,7 @@ use Aws\S3\S3Client; use Icewind\Streams\CallbackWrapper; use Icewind\Streams\IteratorDirectory; use OC\Cache\CappedMemoryCache; +use OC\Files\Cache\CacheEntry; use OC\Files\ObjectStore\S3ConnectionTrait; use OC\Files\ObjectStore\S3ObjectTrait; use OCP\Constants; @@ -374,6 +375,11 @@ class AmazonS3 extends \OC\Files\Storage\Common { //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) { + $stat['size'] = $cacheEntry->getSize(); + $stat['mtime'] = $cacheEntry->getMTime(); + } } else { $stat['size'] = $this->getContentLength($path); $stat['mtime'] = strtotime($this->getLastModified($path));