Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/BackgroundJobs/FileSystemListenerJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected function run($argument): void {
}

try {
$node = current($this->rootFolder->getUserFolder($fsEvent->getUserId())->getById($fsEvent->getNodeId()));
$node = $this->rootFolder->getUserFolder($fsEvent->getUserId())->getFirstNodeById($fsEvent->getNodeId());
} catch (\Exception $e) {
$this->logger->warning('Error retrieving node for fs event' . $e->getMessage(), [
'exception' => $e,
Expand Down
2 changes: 1 addition & 1 deletion lib/BackgroundJobs/IndexerJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ protected function index(array $files): void {
// this includes files that are too large, locked, or not readable
$visitedQFiles[] = $queueFile;

$file = current($this->rootFolder->getById($queueFile->getFileId()));
$file = $this->rootFolder->getFirstNodeById($queueFile->getFileId());
if (!$file instanceof File) {
continue;
}
Expand Down
8 changes: 4 additions & 4 deletions lib/Listener/FileListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ public function handle(Event $event): void {
}

if ($event instanceof CacheEntryInsertedEvent) {
$node = current($this->rootFolder->getById($event->getFileId()));
if ($node === false) {
$node = $this->rootFolder->getFirstNodeById($event->getFileId());
if ($node === null) {
return;
}
if ($node instanceof Folder) {
Expand All @@ -105,8 +105,8 @@ public function handle(Event $event): void {
if ($cacheEntry === false) {
return;
}
$node = current($this->rootFolder->getById($cacheEntry->getId()));
if ($node === false) {
$node = $this->rootFolder->getFirstNodeById($cacheEntry->getId());
if ($node === null) {
return;
}
// Synchronous, because we wouldn't have the recursive list of file ids after deletion
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/FsEventService.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function onInsert(Node $node, bool $recurse = true, bool $update = false)
}

foreach ($fileIds as $fileId) {
$file = current($this->rootFolder->getById($fileId));
$file = $this->rootFolder->getFirstNodeById($fileId);
if (!$file instanceof File) {
continue;
}
Expand Down
Loading