From 2830eeac7ea261e38cc8e03847c44a352733cd17 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Mon, 24 Oct 2022 16:17:27 +0200 Subject: [PATCH] Dispatch event for all remove entry Signed-off-by: Louis Chemineau --- lib/private/Files/Cache/Cache.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index ec284282178e9..d389d0df20a86 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -573,7 +573,7 @@ private function getSubFolders(ICacheEntry $entry) { } /** - * Recursively remove all children of a folder + * Remove all children of a folder * * @param ICacheEntry $entry the cache entry of the folder to remove the children of * @throws \OC\DatabaseException @@ -581,6 +581,8 @@ private function getSubFolders(ICacheEntry $entry) { private function removeChildren(ICacheEntry $entry) { $parentIds = [$entry->getId()]; $queue = [$entry->getId()]; + $deletedIds = []; + $deletedPaths = []; // we walk depth first through the file tree, removing all filecache_extended attributes while we walk // and collecting all folder ids to later use to delete the filecache entries @@ -589,6 +591,12 @@ private function removeChildren(ICacheEntry $entry) { $childIds = array_map(function (ICacheEntry $cacheEntry) { return $cacheEntry->getId(); }, $children); + $childPaths = array_map(function (ICacheEntry $cacheEntry) { + return $cacheEntry->getPath(); + }, $children); + + $deletedIds = array_merge($deletedIds, $childIds); + $deletedPaths = array_merge($deletedPaths, $childPaths); $query = $this->getQueryBuilder(); $query->delete('filecache_extended') @@ -617,6 +625,16 @@ private function removeChildren(ICacheEntry $entry) { $query->setParameter('parentIds', $parentIdChunk, IQueryBuilder::PARAM_INT_ARRAY); $query->execute(); } + + foreach (array_combine($deletedIds, $deletedPaths) as $fileId => $filePath) { + $cacheEntryRemovedEvent = new CacheEntryRemovedEvent( + $this->storage, + $filePath, + $fileId, + $this->getNumericStorageId() + ); + $this->eventDispatcher->dispatchTyped($cacheEntryRemovedEvent); + } } /**