Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dispatch event for all removed entries #34773

Merged
merged 1 commit into from
Mar 21, 2023
Merged

Dispatch event for all removed entries #34773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion lib/private/Files/Cache/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,14 +573,16 @@ 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
*/
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
Expand All @@ -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')
Expand Down Expand Up @@ -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);
}
}

/**
Expand Down