Skip to content

Commit

Permalink
Merge pull request #32033 from nextcloud/fix/metadata-scan-app-data
Browse files Browse the repository at this point in the history
Fix scanning app data with metadata
  • Loading branch information
PVince81 authored Apr 25, 2022
2 parents 7872fb0 + 6b6f24c commit 407fb8c
Showing 1 changed file with 22 additions and 1 deletion.
23 changes: 22 additions & 1 deletion lib/private/Metadata/FileEventListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\Files\FileInfo;
use Psr\Log\LoggerInterface;

class FileEventListener implements IEventListener {
private IMetadataManager $manager;
private LoggerInterface $logger;

public function __construct(IMetadataManager $manager) {
public function __construct(IMetadataManager $manager, LoggerInterface $logger) {
$this->manager = $manager;
$this->logger = $logger;
}

private function shouldExtractMetadata(Node $node): bool {
Expand All @@ -52,13 +55,31 @@ private function shouldExtractMetadata(Node $node): bool {
}

$path = $node->getPath();
return $this->isCorrectPath($path);
}

private function isCorrectPath(string $path): bool {
// TODO make this more dynamic, we have the same issue in other places
return !str_starts_with($path, 'appdata_') && !str_starts_with($path, 'files_versions/') && !str_starts_with($path, 'files_trashbin/');
}

public function handle(Event $event): void {
if ($event instanceof NodeRemovedFromCache) {
if (!$this->isCorrectPath($event->getPath())) {
// Don't listen to paths for which we don't extract metadata
return;
}
$view = Filesystem::getView();
if (!$view) {
// Should not happen since a scan in the user folder should setup
// the file system.
$e = new \Exception(); // don't trigger, just get backtrace
$this->logger->error('Detecting deletion of a file with possible metadata but file system setup is not setup', [
'exception' => $e,
'app' => 'metadata'
]);
return;
}
$info = $view->getFileInfo($event->getPath());
if ($info && $info->getType() === FileInfo::TYPE_FILE) {
$this->manager->clearMetadata($info->getId());
Expand Down

0 comments on commit 407fb8c

Please sign in to comment.