small improvement

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Oct 22, 2023 · c89df97 · c89df97
1 parent 754a1f7
commit c89df97
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/core/Command/FilesMetadata/Get.php b/core/Command/FilesMetadata/Get.php
@@ -26,8 +26,6 @@
 
 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;
@@ -59,11 +57,17 @@ protected function configure() {
 				 'file owner'
 			 )
 			 ->addOption(
-				 'refresh',
+				 'as-array',
 				 '',
 				 InputOption::VALUE_NONE,
-				 'refresh metadata'
+				 'display metadata as a simple key=>value array'
 			 )
+			 ->addOption(
+				'refresh',
+				'',
+				InputOption::VALUE_NONE,
+				'refresh metadata'
+			)
 			 ->addOption(
 				 'reset',
 				 '',
@@ -90,7 +94,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$metadata = $this->filesMetadataManager->getMetadata($fileId);
 		}
 
-		$output->writeln(json_encode($metadata, JSON_PRETTY_PRINT));
+		if ($input->getOption('as-array')) {
+			$output->writeln(json_encode($metadata->asArray(), JSON_PRETTY_PRINT));
+		} else {
+			$output->writeln(json_encode($metadata, JSON_PRETTY_PRINT));
+		}
 
 		return 0;
 	}

diff --git a/lib/private/FilesMetadata/FilesMetadataManager.php b/lib/private/FilesMetadata/FilesMetadataManager.php
@@ -50,7 +50,7 @@ public function getMetadata(int $fileId, bool $generate = false): IFilesMetadata
 			return $this->metadataRequestService->getMetadataFromFileId($fileId);
 		} catch (FilesMetadataNotFoundException $e) {
 			if ($generate) {
-				return new FilesMetadata($fileId, true);
+				return new FilesMetadata($fileId);
 			}
 
 			throw $e;
@@ -71,7 +71,9 @@ public function refreshMetadata(
 		}
 
 		if (null === $metadata) {
-			$metadata = new FilesMetadata($node->getId(), true);
+			// if $fromScratch, we reset all and new empty FilesMetadata will
+			// erase the one stored in db even if it stays empty.
+			$metadata = new FilesMetadata($node->getId(), $fromScratch);
 		}
 
 		// is $process is LIVE, we enforce LIVE

diff --git a/lib/public/FilesMetadata/IFilesMetadataManager.php b/lib/public/FilesMetadata/IFilesMetadataManager.php
@@ -19,7 +19,7 @@ public function refreshMetadata(
 		bool $fromScratch = false
 	): IFilesMetadata;
 
-	public function getMetadata(int $fileId): IFilesMetadata;
+	public function getMetadata(int $fileId, bool $generate = false): IFilesMetadata;
 
 	public function saveMetadata(IFilesMetadata $filesMetadata): void;