Generate blurhash during preview creation

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -34,19 +34,18 @@
 namespace OCA\DAV\Connector\Sabre;
 
 use OC\AppFramework\Http\Request;
-use OC\Metadata\IMetadataManager;
+use OC\FilesMetadata\Model\MetadataValueWrapper;
 use OCP\Constants;
 use OCP\Files\ForbiddenException;
 use OCP\Files\StorageNotAvailableException;
+use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IConfig;
 use OCP\IPreview;
 use OCP\IRequest;
 use OCP\IUserSession;
-use Psr\Log\LoggerInterface;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\IFile;
-use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
 use Sabre\DAV\PropPatch;
 use Sabre\DAV\ServerPlugin;
@@ -84,17 +83,7 @@ class FilesPlugin extends ServerPlugin {
 	public const SHARE_NOTE = '{http://nextcloud.org/ns}note';
 	public const SUBFOLDER_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-folder-count';
 	public const SUBFILE_COUNT_PROPERTYNAME = '{http://nextcloud.org/ns}contained-file-count';
-	public const FILE_METADATA_SIZE = '{http://nextcloud.org/ns}file-metadata-size';
-	public const FILE_METADATA_GPS = '{http://nextcloud.org/ns}file-metadata-gps';
-
-	public const ALL_METADATA_PROPS = [
-		self::FILE_METADATA_SIZE => 'size',
-		self::FILE_METADATA_GPS => 'gps',
-	];
-	public const METADATA_MIMETYPES = [
-		'size' => 'image',
-		'gps' => 'image',
-	];
+	public const FILE_METADATA_PREFIX = '{http://nextcloud.org/ns}metadata-';
 
 	/** Reference to main server object */
 	private ?Server $server = null;
@@ -398,6 +387,10 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
 			$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
 				return $node->getName();
 			});
+
+			foreach ($node->getFileInfo()->getMetadata() as $metadataKey => $metadataValue) {
+				$propFind->handle(self::FILE_METADATA_PREFIX.$metadataKey, $metadataValue->getValueAny());
+			}
 		}
 
 		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
@@ -427,31 +420,6 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
 			$propFind->handle(self::UPLOAD_TIME_PROPERTYNAME, function () use ($node) {
 				return $node->getFileInfo()->getUploadTime();
 			});
-
-			if ($this->config->getSystemValueBool('enable_file_metadata', true)) {
-				foreach (self::ALL_METADATA_PROPS as $prop => $meta) {
-					$propFind->handle($prop, function () use ($node, $meta) {
-						if ($node->getFileInfo()->getMimePart() !== self::METADATA_MIMETYPES[$meta]) {
-							return [];
-						}
-
-						if ($node->hasMetadata($meta)) {
-							$metadata = $node->getMetadata($meta);
-						} else {
-							// This code path should not be called since we try to preload
-							// the metadata when loading the folder or the search results
-							// in one go
-							$metadataManager = \OC::$server->get(IMetadataManager::class);
-							$metadata = $metadataManager->fetchMetadataFor($meta, [$node->getId()])[$node->getId()];
-
-							// TODO would be nice to display this in the profiler...
-							\OC::$server->get(LoggerInterface::class)->debug('Inefficient fetching of metadata');
-						}
-
-						return $metadata->getValue();
-					});
-				}
-			}
 		}
 
 		if ($node instanceof Directory) {
@@ -465,39 +433,6 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
 
 			$requestProperties = $propFind->getRequestedProperties();
 
-			$requestedMetaData = [];
-			foreach ($requestProperties as $requestProperty) {
-				if (isset(self::ALL_METADATA_PROPS[$requestProperty])) {
-					$requestedMetaData[] = self::ALL_METADATA_PROPS[$requestProperty];
-				}
-			}
-			if (
-				$this->config->getSystemValueBool('enable_file_metadata', true) &&
-				$propFind->getDepth() === 1 &&
-				$requestedMetaData
-			) {
-				$children = $node->getChildren();
-				// Preloading of the metadata
-
-				/** @var IMetaDataManager $metadataManager */
-				$metadataManager = \OC::$server->get(IMetadataManager::class);
-
-				foreach ($requestedMetaData as $requestedMeta) {
-					$relevantMimeType = self::METADATA_MIMETYPES[$requestedMeta];
-					$childrenForMeta = array_filter($children, function (INode $child) use ($relevantMimeType) {
-						return $child instanceof File && $child->getFileInfo()->getMimePart() === $relevantMimeType;
-					});
-					$fileIds = array_map(function (File $child) {
-						return $child->getFileInfo()->getId();
-					}, $childrenForMeta);
-					$preloadedMetadata = $metadataManager->fetchMetadataFor($requestedMeta, $fileIds);
-
-					foreach ($childrenForMeta as $child) {
-						$child->setMetadata($requestedMeta, $preloadedMetadata[$child->getFileInfo()->getId()]);
-					}
-				}
-			}
-
 			if (in_array(self::SUBFILE_COUNT_PROPERTYNAME, $requestProperties, true)
 				|| in_array(self::SUBFOLDER_COUNT_PROPERTYNAME, $requestProperties, true)) {
 				$nbFiles = 0;
@@ -583,6 +518,57 @@ public function handleUpdateProperties($path, PropPatch $propPatch) {
 			$node->setCreationTime((int) $time);
 			return true;
 		});
+
+
+		/** @var IFilesMetadataManager */
+		$filesMetadataManager = \OCP\Server::get(IFilesMetadataManager::class);
+		$metadata = $filesMetadataManager->getMetadata((int)$node->getFileId());
+
+		foreach ($metadata->getKeys() as $metadataKey) {
+			$propPatch->handle(self::FILE_METADATA_PREFIX.$metadataKey, function (mixed $value) use ($metadata, $metadataKey, $filesMetadataManager) {
+				switch ($metadata->getType($metadataKey)) {
+					case MetadataValueWrapper::TYPE_STRING:
+						$metadata->set($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_INT:
+						$metadata->setInt($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_FLOAT:
+						$metadata->setFloat($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_BOOL:
+						$metadata->setBool($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_ARRAY:
+						$metadata->setArray($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_STRING_LIST:
+						$metadata->setStringList($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_INT_LIST:
+						$metadata->setIntList($metadataKey, $value);
+						break;
+				}
+
+				$filesMetadataManager->saveMetadata($metadata);
+				return true;
+			});
+		}
+
+		foreach ($propPatch->getRemainingMutations() as $mutation) {
+			if (!str_starts_with($mutation, self::FILE_METADATA_PREFIX)) {
+				continue;
+			}
+
+			$propPatch->handle($mutation, function ($value) use ($metadata, $mutation, $filesMetadataManager) {
+				$metadataKey = substr($mutation, strlen(self::FILE_METADATA_PREFIX));
+				$metadata->set($metadataKey, $value);
+				$filesMetadataManager->saveMetadata($metadata);
+				return true;
+			});
+		}
+
+
 		/**
 		 * Disable modification of the displayname property for files and
 		 * folders via PROPPATCH. See PROPFIND for more information.

apps/files/lib/Command/Scan.php

@@ -37,17 +37,19 @@
 use OC\Core\Command\InterruptedException;
 use OC\DB\Connection;
 use OC\DB\ConnectionAdapter;
+use OC\FilesMetadata\FilesMetadataManager;
+use OC\ForbiddenException;
+use OC\Metadata\MetadataManager;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Events\FileCacheUpdated;
 use OCP\Files\Events\NodeAddedToCache;
 use OCP\Files\Events\NodeRemovedFromCache;
 use OCP\Files\File;
-use OC\ForbiddenException;
-use OC\Metadata\MetadataManager;
-use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\NotFoundException;
 use OCP\Files\StorageNotAvailableException;
+use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Helper\Table;
@@ -69,6 +71,7 @@ public function __construct(
 		private IUserManager $userManager,
 		private IRootFolder $rootFolder,
 		private MetadataManager $metadataManager,
+		private FilesMetadataManager $filesMetadataManager,
 		private IEventDispatcher $eventDispatcher,
 		private LoggerInterface $logger,
 	) {
@@ -137,9 +140,10 @@ protected function scanFiles(string $user, string $path, bool $scanMetadata, Out
 			$this->abortIfInterrupted();
 			if ($scanMetadata) {
 				$node = $this->rootFolder->get($path);
-				if ($node instanceof File) {
-					$this->metadataManager->generateMetadata($node, false);
-				}
+				$this->filesMetadataManager->refreshMetadata(
+					$node,
+					IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND
+				);
 			}
 		});
 

apps/files_trashbin/lib/Trash/TrashItem.php

@@ -190,4 +190,8 @@ public function getUploadTime(): int {
 	public function getParentId(): int {
 		return $this->fileInfo->getParentId();
 	}
+
+	public function getMetadata(): array {
+		return $this->fileInfo->getMetadata();
+	}
 }

core/Application.php

@@ -44,7 +44,9 @@
 use OC\Authentication\Notifications\Notifier as AuthenticationNotifier;
 use OC\Core\Listener\BeforeTemplateRenderedListener;
 use OC\Core\Notification\CoreNotifier;
-use OC\Metadata\FileEventListener;
+use OC\FilesMetadata\Provider\ExifMetadataProvider;
+use OC\FilesMetadata\Provider\OriginalDateTimeMetadataProvider;
+use OC\FilesMetadata\Provider\SizeMetadataProvider;
 use OC\TagManager;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Http\Events\BeforeLoginTemplateRenderedEvent;
@@ -54,13 +56,10 @@
 use OCP\DB\Events\AddMissingPrimaryKeyEvent;
 use OCP\DB\Types;
 use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Files\Events\Node\NodeDeletedEvent;
-use OCP\Files\Events\Node\NodeWrittenEvent;
-use OCP\Files\Events\NodeRemovedFromCache;
+use OCP\FilesMetadata\Event\MetadataLiveEvent;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
-use OCP\IConfig;
 
 /**
  * Class Application
@@ -332,16 +331,9 @@ public function __construct() {
 		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedWebAuthnCleanupListener::class);
 
 		// Metadata
-		/** @var IConfig $config */
-		$config = $container->get(IConfig::class);
-		if ($config->getSystemValueBool('enable_file_metadata', true)) {
-			/** @psalm-suppress InvalidArgument */
-			$eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
-			/** @psalm-suppress InvalidArgument */
-			$eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
-			/** @psalm-suppress InvalidArgument */
-			$eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
-		}
+		$eventDispatcher->addServiceListener(MetadataLiveEvent::class, ExifMetadataProvider::class, 1);
+		$eventDispatcher->addServiceListener(MetadataLiveEvent::class, SizeMetadataProvider::class);
+		$eventDispatcher->addServiceListener(MetadataLiveEvent::class, OriginalDateTimeMetadataProvider::class);
 
 		// Tags
 		$eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);

core/Command/FilesMetadata/Get.php

@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2023 Maxence Lange <[email protected]>
+ *
+ * @author Maxence Lange <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Command\FilesMetadata;
+
+use OC\DB\ConnectionAdapter;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
+use OCP\FilesMetadata\IFilesMetadataManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Get extends Command {
+	public function __construct(
+		private IRootFolder $rootFolder,
+		private IFilesMetadataManager $filesMetadataManager,
+	) {
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this->setName('metadata:get')
+			 ->setDescription('get stored metadata about a file, by its id')
+			 ->addArgument(
+				 'fileId',
+				 InputArgument::REQUIRED,
+				 'id of the file document'
+			 )
+			 ->addArgument(
+				 'userId',
+				 InputArgument::OPTIONAL,
+				 'file owner'
+			 )
+			 ->addOption(
+				 'refresh',
+				 '',
+				 InputOption::VALUE_NONE,
+				 'refresh metadata'
+			 )
+			 ->addOption(
+				 'reset',
+				 '',
+				 InputOption::VALUE_NONE,
+				 'refresh metadata from scratch'
+			 );
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$fileId = (int)$input->getArgument('fileId');
+		if ($input->getOption('refresh')) {
+			$node = $this->rootFolder->getUserFolder($input->getArgument('userId'))->getById($fileId);
+			$file = $node[0];
+			if (null === $file) {
+				throw new NotFoundException();
+			}
+
+			$metadata = $this->filesMetadataManager->refreshMetadata(
+				$file,
+				IFilesMetadataManager::PROCESS_LIVE | IFilesMetadataManager::PROCESS_BACKGROUND,
+				$input->getOption('reset')
+			);
+		} else {
+			$metadata = $this->filesMetadataManager->getMetadata($fileId);
+		}
+
+		$output->writeln(json_encode($metadata, JSON_PRETTY_PRINT));
+
+		return 0;
+	}
+}