fixup! Support getting and patching version-label

Author: artonge

apps/files_versions/lib/Sabre/VersionFile.php

@@ -83,7 +83,7 @@ public function setName($name) {
 	}
 
 	public function getLabel(): string {
-		return (string)$this->version->getLabel();
+		return $this->version->getLabel();
 	}
 
 	public function setLabel($label): void {

apps/files_versions/lib/Versions/IVersion.php

@@ -81,10 +81,10 @@ public function getSourceFileName(): string;
 	/**
 	 * Get the user created label
 	 *
-	 * @return ?string
+	 * @return string
 	 * @since 26.0.0
 	 */
-	public function getLabel(): ?string;
+	public function getLabel(): string;
 
 	/**
 	 * Get the mimetype of this version

apps/files_versions/lib/Versions/LegacyVersionsBackend.php

@@ -26,6 +26,7 @@
  */
 namespace OCA\Files_Versions\Versions;
 
+use OC\Files\Node\File as NodeFile;
 use OC\Files\View;
 use OCA\Files_Sharing\SharedStorage;
 use OCA\Files_Versions\Db\VersionEntity;
@@ -72,30 +73,48 @@ public function getVersionsForFile(IUser $user, FileInfo $file): array {
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		$nodes = $userFolder->getById($file->getId());
 		$file2 = array_pop($nodes);
-		$versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
-		$versionsLabels = array_reduce(
-			$this->versionsMapper->findAllVersionsForFileId($file->getId()),
-			function ($carry, VersionEntity $item) {
-				$carry[$item->getTimestamp()] = $item->getLabel();
-				return $carry;
-			},
-			[]
-		);
 
-		return array_map(function (array $data) use ($file, $user, $versionsLabels) {
-			return new Version(
-				(int)$data['version'],
-				(int)$data['version'],
-				$data['name'],
-				$versionsLabels[(int)$data['version']] ?? '',
-				(int)$data['size'],
-				$data['mimetype'],
-				$data['path'],
+		$versions = $this->getVersionsForFileFromDB($file2, $user);
+
+		if (count($versions) > 0) {
+			return $versions;
+		}
+
+		$versionsOnFS = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
+		foreach ($versionsOnFS as $version) {
+			// Insert the entry in the DB.
+			$versionEntity = new VersionEntity();
+			$versionEntity->setFileId($file2->getId());
+			$versionEntity->setTimestamp((int)$version['version']);
+			$versionEntity->setSize((int)$version['size']);
+			$versionEntity->setMimetype($version['mimetype']);
+			$this->versionsMapper->insert($versionEntity);
+		}
+
+		return $this->getVersionsForFileFromDB($file2, $user);
+	}
+
+	/**
+	 * @return IVersion[]
+	 */
+	private function getVersionsForFileFromDB(NodeFile $file, IUser $user): array {
+		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
+
+		return array_map(
+			fn ($version) => new Version(
+				$version->getTimestamp(),
+				$version->getTimestamp(),
+				$file->getName(),
+				$version->getLabel() ?? '',
+				$version->getSize(),
+				$version->getMimetype(),
+				$userFolder->getRelativePath($file->getPath()),
 				$file,
 				$this,
 				$user
-			);
-		}, $versions);
+			),
+			$this->versionsMapper->findAllVersionsForFileId($file->getId())
+		);
 	}
 
 	public function createVersion(IUser $user, FileInfo $file) {
@@ -150,23 +169,11 @@ public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): Fi
 	 * @since 26.0.0
 	 */
 	public function setVersionLabel(IVersion $version, string $label): void {
-		try {
-			$versionEntity = $this->versionsMapper->findVersionForFileId(
-				$version->getSourceFile()->getId(),
-				$version->getSourceFile()->getMtime()
-			);
-			$versionEntity->setLabel($label);
-			$this->versionsMapper->update($versionEntity);
-		} catch(DoesNotExistException $ex) {
-			// Fallback if the DB does not contains the version entry.
-			$versionEntity = new VersionEntity();
-			$versionEntity->setFileId($version->getSourceFile()->getId());
-			// TODO: check that the mtime is the version's one.
-			$versionEntity->setTimestamp($version->getTimestamp());
-			$versionEntity->setLabel($label);
-			// TODO: remove or keep
-			// $versionEntity->setLabel($versionEntity->setAuthor($currentUserId));
-			$this->versionsMapper->insert($versionEntity);
-		}
+		$versionEntity = $this->versionsMapper->findVersionForFileId(
+			$version->getSourceFile()->getId(),
+			$version->getSourceFile()->getMtime()
+		);
+		$versionEntity->setLabel($label);
+		$this->versionsMapper->update($versionEntity);
 	}
 }

apps/files_versions/lib/Versions/Version.php

@@ -38,7 +38,7 @@ class Version implements IVersion {
 	/** @var string */
 	private $name;
 
-	private ?string $label;
+	private string $label;
 
 	/** @var int */
 	private $size;
@@ -62,7 +62,7 @@ public function __construct(
 		int $timestamp,
 		$revisionId,
 		string $name,
-		?string $label,
+		string $label,
 		int $size,
 		string $mimetype,
 		string $path,
@@ -106,7 +106,7 @@ public function getSourceFileName(): string {
 		return $this->name;
 	}
 
-	public function getLabel(): ?string {
+	public function getLabel(): string {
 		return $this->label;
 	}