refactor(preview): Cleanup the implementation of the new preview backend

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

build/psalm-baseline.xml

@@ -2997,17 +2997,6 @@
       <code><![CDATA[$this->timeFactory->getTime()]]></code>
     </InvalidScalarArgument>
   </file>
-  <file src="core/Command/Preview/Repair.php">
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[section]]></code>
-      <code><![CDATA[section]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
-  <file src="core/Command/Preview/ResetRenderedTexts.php">
-    <InvalidReturnStatement>
-      <code><![CDATA[[]]]></code>
-    </InvalidReturnStatement>
-  </file>
   <file src="core/Command/Security/BruteforceAttempts.php">
     <DeprecatedMethod>
       <code><![CDATA[getAttempts]]></code>

core/BackgroundJobs/MovePreviewJob.php

@@ -1,8 +1,10 @@
 <?php
 
 declare(strict_types=1);
-/**
- * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH
+ * SPDX-FileContributor: Carl Schwan
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
@@ -17,7 +19,7 @@
 use OCP\DB\Exception;
 use OCP\Files\AppData\IAppDataFactory;
 use OCP\Files\IAppData;
-use OCP\Files\SimpleFS\ISimpleFile;
+use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IAppConfig;
 use OCP\IDBConnection;
@@ -42,15 +44,6 @@ public function __construct(
 	}
 
 	protected function run(mixed $argument): void {
-		try {
-			$this->doRun($argument);
-		} catch (\Throwable $exception) {
-			echo $exception->getMessage();
-			throw $exception;
-		}
-	}
-
-	private function doRun($argument): void {
 		if ($this->appConfig->getValueBool('core', 'previewMovedDone')) {
 			return;
 		}
@@ -118,8 +111,12 @@ private function doRun($argument): void {
 			}
 		}
 
-		// Delete any leftover preview directory
-		$this->appData->getFolder('.')->delete();
+		try {
+			// Delete any leftover preview directory
+			$this->appData->getFolder('.')->delete();
+		} catch (NotFoundException) {
+			// ignore
+		}
 		$this->appConfig->setValueBool('core', 'previewMovedDone', true);
 	}
 
@@ -166,7 +163,7 @@ private function processPreviews(array $previewFolders, bool $simplePaths): void
 			$qb = $this->connection->getQueryBuilder();
 			$qb->select('*')
 				->from('filecache')
-				->where($qb->expr()->like('fileid', $qb->createNamedParameter($fileId)));
+				->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)));
 
 			$result = $qb->executeQuery();
 			$result = $result->fetchAll();
@@ -175,13 +172,17 @@ private function processPreviews(array $previewFolders, bool $simplePaths): void
 				foreach ($previewFiles as $previewFile) {
 					$preview = new Preview();
 					$preview->setFileId((int)$fileId);
-					$preview->setOldFileId($previewFile['file']->getId());
+					/** @var SimpleFile $file */
+					$file = $previewFile['file'];
+					$preview->setOldFileId($file->getId());
+					$preview->setStorageId($result[0]['storage']);
 					$preview->setEtag($result[0]['etag']);
 					$preview->setMtime($previewFile['mtime']);
 					$preview->setWidth($previewFile['width']);
 					$preview->setHeight($previewFile['height']);
-					$preview->setCrop($previewFile['crop']);
-					$preview->setIsMax($previewFile['max']);
+					$preview->setCropped($previewFile['crop']);
+					$preview->setMax($previewFile['max']);
+					$preview->setEncrypted(false);
 					$preview->setMimetype(match ($previewFile['extension']) {
 						'png' => IPreview::MIMETYPE_PNG,
 						'webp' => IPreview::MIMETYPE_WEBP,