Skip to content

feat: allow passing a cache entry to getMetadataForNode #65586

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

Open
icewind1991 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −6
Open

feat: allow passing a cache entry to getMetadataForNode #65586

Show file tree
Hide file tree
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
12 changes: 8 additions & 4 deletions lib/private/FilesMetadata/FilesMetadataManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Cache\CacheEntriesRemovedEvent;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Events\Node\NodeWrittenEvent;
use OCP\Files\InvalidPathException;
use OCP\Files\Node;
Expand Down Expand Up @@ -139,10 +140,13 @@ public function getMetadata(int $fileId, bool $generate = false, ?int $storageId
}

#[\Override]
public function getMetadataForNode(Node $node, bool $generate = false): IFilesMetadata {
/** @var FilesMetadata $metadata */
$metadata = $this->getMetadata($node->getId(), $generate, $node->getMountPoint()->getNumericStorageId());
return $metadata;
public function getMetadataForNode(Node|ICacheEntry $node, bool $generate = false): IFilesMetadata {
if ($node instanceof Node) {
$storageId = $node->getData()->getStorageId();
} else {
$storageId = $node->getStorageId();
}
return $this->getMetadata($node->getId(), $generate, $storageId);
}

/**
Expand Down
5 changes: 3 additions & 2 deletions lib/public/FilesMetadata/IFilesMetadataManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

use OCP\AppFramework\Attribute\Consumable;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Node;
use OCP\FilesMetadata\Exceptions\FilesMetadataException;
use OCP\FilesMetadata\Exceptions\FilesMetadataNotFoundException;
Expand Down Expand Up @@ -71,14 +72,14 @@ public function getMetadata(int $fileId, bool $generate = false): IFilesMetadata
/**
* returns metadata of a file id
*
* @param Node $node file id
* @param Node|ICacheEntry $node file id
* @param boolean $generate Generate if metadata does not exist
*
* @return IFilesMetadata
* @throws FilesMetadataNotFoundException if not found
* @since 36.0.0
*/
public function getMetadataForNode(Node $node, bool $generate = false): IFilesMetadata;
public function getMetadataForNode(Node|ICacheEntry $node, bool $generate = false): IFilesMetadata;

/**
* returns metadata of multiple file ids
Expand Down
Loading