From bbe17f35a17af28410915e9dcb1263cc51edcb49 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 14 Aug 2014 14:50:52 +0200 Subject: [PATCH] Remove no longer existing files from the cache when scanning external storage --- apps/files_sharing/lib/external/scanner.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php index 4dc5d4be9d8..4e61e0c4ccb 100644 --- a/apps/files_sharing/lib/external/scanner.php +++ b/apps/files_sharing/lib/external/scanner.php @@ -28,11 +28,21 @@ class Scanner extends \OC\Files\Cache\Scanner { } private function addResult($data, $path) { - $this->cache->put($path, $data); + $id = $this->cache->put($path, $data); if (isset($data['children'])) { + $children = array(); foreach ($data['children'] as $child) { + $children[$child['name']] = true; $this->addResult($child, ltrim($path . '/' . $child['name'], '/')); } + + $existingCache = $this->cache->getFolderContentsById($id); + foreach ($existingCache as $existingChild) { + // if an existing child is not in the new data, remove it + if (!isset($children[$existingChild['name']])) { + $this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/')); + } + } } } } -- 2.39.5