diff options
author | Jonas <jonas@freesources.org> | 2025-05-27 10:05:02 +0200 |
---|---|---|
committer | Jonas <jonas@freesources.org> | 2025-05-27 12:14:14 +0200 |
commit | e5b4ae4ebefbc9ca33599589394cae8d3bb571a5 (patch) | |
tree | 70f4dd89809341e1219acf56781eee3647091988 | |
parent | c952570e6700906cbed71a7036e68211b38936f5 (diff) | |
download | nextcloud-server-fix/emit_hooks_on_copy.tar.gz nextcloud-server-fix/emit_hooks_on_copy.zip |
fix(SyncLivePhotosListener): Don't handle copy event emitted from usfix/emit_hooks_on_copy
Running $peerFile->copy() causes a second BeforeNodeCopiedEvent now,
which we don't want to handle.
Signed-off-by: Jonas <jonas@freesources.org>
-rw-r--r-- | apps/files/lib/Listener/SyncLivePhotosListener.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/files/lib/Listener/SyncLivePhotosListener.php b/apps/files/lib/Listener/SyncLivePhotosListener.php index 6334e5d16a6..b6773e8c452 100644 --- a/apps/files/lib/Listener/SyncLivePhotosListener.php +++ b/apps/files/lib/Listener/SyncLivePhotosListener.php @@ -37,6 +37,8 @@ class SyncLivePhotosListener implements IEventListener { private array $pendingRenames = []; /** @var Array<int, bool> */ private array $pendingDeletion = []; + /** @var Array<int> */ + private array $pendingCopies = []; public function __construct( private ?Folder $userFolder, @@ -153,7 +155,6 @@ class SyncLivePhotosListener implements IEventListener { $targetName = $targetFile->getName(); $peerTargetName = substr($targetName, 0, -strlen($sourceExtension)) . $peerFileExtension; - if ($targetParent->nodeExists($peerTargetName)) { // If the copy was a folder copy, then the peer file already exists. $targetPeerFile = $targetParent->get($peerTargetName); @@ -225,6 +226,11 @@ class SyncLivePhotosListener implements IEventListener { $this->handleCopyRecursive($event, $sourceChild, $targetChild); } } elseif ($sourceNode instanceof File && $targetNode instanceof File) { + // in case the copy was initiated from this listener, we stop right now + if (in_array($sourceNode->getId(), $this->pendingCopies)) { + return; + } + $peerFileId = $this->livePhotosService->getLivePhotoPeerId($sourceNode->getId()); if ($peerFileId === null) { return; @@ -234,11 +240,13 @@ class SyncLivePhotosListener implements IEventListener { return; } + $this->pendingCopies[] = $peerFileId; if ($event instanceof BeforeNodeCopiedEvent) { $this->runMoveOrCopyChecks($sourceNode, $targetNode, $peerFile); } elseif ($event instanceof NodeCopiedEvent) { $this->handleCopy($sourceNode, $targetNode, $peerFile); } + $this->pendingCopies = array_diff($this->pendingCopies, [$peerFileId]); } else { throw new Exception('Source and target type are not matching'); } |