Use new metadata API

Signed-off-by: Louis Chemineau <louis@chmn.me>

appinfo/info.xml

@@ -32,7 +32,6 @@
 
  <commands>
  <command>OCA\Photos\Command\UpdateReverseGeocodingFilesCommand</command>
- <command>OCA\Photos\Command\MapMediaToPlaceCommand</command>
  </commands>
 
  <sabre>
@@ -48,4 +47,4 @@
  <background-jobs>
  <job>OCA\Photos\Jobs\AutomaticPlaceMapperJob</job>
  </background-jobs>
-</info>
+</info>

lib/AppInfo/Application.php

@@ -28,15 +28,19 @@
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\Events\SabrePluginAuthInitEvent;
 use OCA\Photos\Listener\AlbumsManagementEventListener;
-use OCA\Photos\Listener\PlaceManagerEventListener;
 use OCA\Photos\Listener\SabrePluginAuthInitListener;
 use OCA\Photos\Listener\TagListener;
+use OCA\Photos\MetadataProvider\ExifMetadataProvider;
+use OCA\Photos\MetadataProvider\OriginalDateTimeMetadataProvider;
+use OCA\Photos\MetadataProvider\PlaceMetadataProvider;
+use OCA\Photos\MetadataProvider\SizeMetadataProvider;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Files\Events\Node\NodeDeletedEvent;
-use OCP\Files\Events\Node\NodeWrittenEvent;
+use OCP\FilesMetadata\Event\MetadataBackgroundEvent;
+use OCP\FilesMetadata\Event\MetadataLiveEvent;
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\Group\Events\UserRemovedEvent;
 use OCP\Share\Events\ShareDeletedEvent;
@@ -75,8 +79,12 @@ public function register(IRegistrationContext $context): void {
  /** Register $principalBackend for the DAV collection */
  $context->registerServiceAlias('principalBackend', Principal::class);
 
- // Priority of -1 to be triggered after event listeners populating metadata.
- $context->registerEventListener(NodeWrittenEvent::class, PlaceManagerEventListener::class, -1);
+ // Metadata
+ $context->registerEventListener(MetadataLiveEvent::class, ExifMetadataProvider::class);
+ $context->registerEventListener(MetadataLiveEvent::class, SizeMetadataProvider::class);
+ $context->registerEventListener(MetadataLiveEvent::class, OriginalDateTimeMetadataProvider::class);
+ $context->registerEventListener(MetadataLiveEvent::class, PlaceMetadataProvider::class);
+ $context->registerEventListener(MetadataBackgroundEvent::class, PlaceMetadataProvider::class);
 
  $context->registerEventListener(NodeDeletedEvent::class, AlbumsManagementEventListener::class);
  $context->registerEventListener(UserRemovedEvent::class, AlbumsManagementEventListener::class);

lib/DB/Place/PlaceMapper.php

@@ -25,11 +25,11 @@
 
 namespace OCA\Photos\DB\Place;
 
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\IMimeTypeLoader;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
+use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IDBConnection;
 
 class PlaceMapper {
@@ -39,6 +39,7 @@ public function __construct(
  private IDBConnection $connection,
  private IMimeTypeLoader $mimeTypeLoader,
  private IRootFolder $rootFolder,
+ private IFilesMetadataManager $filesMetadataManager,
  ) {
  }
 
@@ -166,30 +167,7 @@ public function findFileForUserAndPlace(string $userId, string $place, string $f
  }
 
  public function setPlaceForFile(string $place, int $fileId): void {
- try {
- $query = $this->connection->getQueryBuilder();
- $query->insert('file_metadata')
- ->values([
- "id" => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
- "group_name" => $query->createNamedParameter(self::METADATA_GROUP),
- "value" => $query->createNamedParameter($place),
- ])
- ->executeStatement();
- } catch (\Exception $ex) {
- if ($ex->getPrevious() instanceof UniqueConstraintViolationException) {
- $this->updatePlaceForFile($place, $fileId);
- } else {
- throw $ex;
- }
- }
- }
-
- public function updatePlaceForFile(string $place, int $fileId): void {
- $query = $this->connection->getQueryBuilder();
- $query->update('file_metadata')
- ->set("value", $query->createNamedParameter($place))
- ->where($query->expr()->eq('id', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
- ->andWhere($query->expr()->eq('group_name', $query->createNamedParameter(self::METADATA_GROUP)))
- ->executeStatement();
+ $metadata = $this->filesMetadataManager->getMetadata($fileId, true);
+ $metadata->set('gps', $place, true);
  }
 }