chore: get revision for a node

Signed-off-by: Borja Domínguez Vázquez <[email protected]>
Signed-off-by: Borja Domínguez Vázquez <[email protected]>

# Conflicts:
#	apps/files_versions/lib/Listener/VersionAuthorListener.php

wip

Signed-off-by: Borja Domínguez Vázquez <[email protected]>
Signed-off-by: Borja Domínguez Vázquez <[email protected]>

wip

Signed-off-by: Borja Domínguez Vázquez <[email protected]>
Signed-off-by: Borja Domínguez Vázquez <[email protected]>

Update IVersionBackend.php

Signed-off-by: Borja Domínguez Vázquez <[email protected]>

Author: bdovaz

apps/files_versions/lib/Listener/FileEventsListener.php

@@ -152,8 +152,10 @@ public function touch_hook(Node $node): void {
 
 		try {
 			if ($node instanceof File && $this->versionManager instanceof INeedSyncVersionBackend) {
+				$revision = $this->versionManager->getRevision($previousNode);
+
 				// We update the timestamp of the version entity associated with the previousNode.
-				$this->versionManager->updateVersionEntity($node, $previousNode->getMTime(), ['timestamp' => $node->getMTime()]);
+				$this->versionManager->updateVersionEntity($node, $revision, ['timestamp' => $node->getMTime()]);
 			}
 		} catch (DbalException $ex) {
 			// Ignore UniqueConstraintViolationException, as we are probably in the middle of a rollback
@@ -252,9 +254,11 @@ public function post_write_hook(Node $node): void {
 				// If no new version was stored in the FS, no new version should be added in the DB.
 				// So we simply update the associated version.
 				if ($node instanceof File && $this->versionManager instanceof INeedSyncVersionBackend) {
+					$revision = $this->versionManager->getRevision($writeHookInfo['previousNode']);
+
 					$this->versionManager->updateVersionEntity(
 						$node,
-						$writeHookInfo['previousNode']->getMtime(),
+						$revision,
 						[
 							'timestamp' => $node->getMTime(),
 							'size' => $node->getSize(),

apps/files_versions/lib/Listener/VersionAuthorListener.php

@@ -48,8 +48,9 @@ public function post_write_hook(Node $node): void {
 		}
 		// check if our version manager supports setting the metadata
 		if ($this->versionManager instanceof IMetadataVersionBackend) {
+			$revision = $this->versionManager->getRevision($node);
 			$author = $user->getUID();
-			$this->versionManager->setMetadataValue($node, $node->getMTime(), Plugin::AUTHOR, $author);
+			$this->versionManager->setMetadataValue($node, $revision, Plugin::AUTHOR, $author);
 		}
 	}
 }

apps/files_versions/lib/Versions/IVersionBackend.php

@@ -8,6 +8,7 @@
  */
 namespace OCA\Files_Versions\Versions;
 
+use OC\Files\Node\Node;
 use OCP\Files\File;
 use OCP\Files\FileInfo;
 use OCP\Files\NotFoundException;
@@ -78,4 +79,11 @@ public function read(IVersion $version);
 	 * @since 15.0.0
 	 */
 	public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File;
+
+	/**
+	 * Get the revision for a node
+	 *
+	 * @since 32.0.0
+	 */
+	public function getRevision(Node $node): int;
 }

apps/files_versions/lib/Versions/VersionManager.php

@@ -110,6 +110,10 @@ public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): Fi
 		return $backend->getVersionFile($user, $sourceFile, $revision);
 	}
 
+	public function getRevision(Node $node): int {
+		return $node->getMTime();
+	}
+
 	public function useBackendForStorage(IStorage $storage): bool {
 		return false;
 	}