nextcloud / server

lib/private/Preview/Watcher.php

Indentation +37 added lines, -37 removed lines

@@ -23,46 +23,46 @@
  * Class that will watch filesystem activity and remove previews as needed.
  */
 class Watcher {
-	/**
-	 * Watcher constructor.
-	 */
-	public function __construct(
-		private readonly StorageFactory $storageFactory,
-		private readonly PreviewMapper $previewMapper,
-		private readonly IDBConnection $connection,
-	) {
-	}
+    /**
+     * Watcher constructor.
+     */
+    public function __construct(
+        private readonly StorageFactory $storageFactory,
+        private readonly PreviewMapper $previewMapper,
+        private readonly IDBConnection $connection,
+    ) {
+    }
 
-	public function postWrite(Node $node): void {
-		$this->deleteNode($node);
-	}
+    public function postWrite(Node $node): void {
+        $this->deleteNode($node);
+    }
 
-	protected function deleteNode(FileInfo $node): void {
-		// We only handle files
-		if ($node instanceof Folder) {
-			return;
-		}
+    protected function deleteNode(FileInfo $node): void {
+        // We only handle files
+        if ($node instanceof Folder) {
+            return;
+        }
 
-		$nodeId = $node->getId();
-		if (is_null($nodeId)) {
-			return;
-		}
+        $nodeId = $node->getId();
+        if (is_null($nodeId)) {
+            return;
+        }
 
-		[$node->getId() => $previews] = $this->previewMapper->getAvailablePreviews([$nodeId]);
-		$this->connection->beginTransaction();
-		try {
-			foreach ($previews as $preview) {
-				$this->storageFactory->deletePreview($preview);
-				$this->previewMapper->delete($preview);
-			}
-		} finally {
-			$this->connection->commit();
-		}
-	}
+        [$node->getId() => $previews] = $this->previewMapper->getAvailablePreviews([$nodeId]);
+        $this->connection->beginTransaction();
+        try {
+            foreach ($previews as $preview) {
+                $this->storageFactory->deletePreview($preview);
+                $this->previewMapper->delete($preview);
+            }
+        } finally {
+            $this->connection->commit();
+        }
+    }
 
-	public function versionRollback(array $data): void {
-		if (isset($data['node'])) {
-			$this->deleteNode($data['node']);
-		}
-	}
+    public function versionRollback(array $data): void {
+        if (isset($data['node'])) {
+            $this->deleteNode($data['node']);
+        }
+    }
 }

lib/private/Preview/Db/PreviewMapper.php

Indentation +177 added lines, -177 removed lines

@@ -22,181 +22,181 @@
  */
 class PreviewMapper extends QBMapper {
 
-	private const TABLE_NAME = 'previews';
-	private const LOCATION_TABLE_NAME = 'preview_locations';
-	private const VERSION_TABLE_NAME = 'preview_versions';
-
-	public function __construct(
-		IDBConnection $db,
-		private readonly IMimeTypeLoader $mimeTypeLoader,
-	) {
-		parent::__construct($db, self::TABLE_NAME, Preview::class);
-	}
-
-	protected function mapRowToEntity(array $row): Entity {
-		$row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype_id']);
-		$row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['source_mimetype_id']);
-
-		return parent::mapRowToEntity($row);
-	}
-
-	#[Override]
-	public function insert(Entity $entity): Entity {
-		/** @var Preview $preview */
-		$preview = $entity;
-
-		$preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
-		$preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
-
-		if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
-			$qb = $this->db->getQueryBuilder();
-			$qb->insert(self::VERSION_TABLE_NAME)
-				->values([
-					'version' => $preview->getVersion(),
-					'file_id' => $preview->getFileId(),
-				])
-				->executeStatement();
-			$entity->setVersionId($qb->getLastInsertId());
-		}
-		return parent::insert($preview);
-	}
-
-	#[Override]
-	public function update(Entity $entity): Entity {
-		/** @var Preview $preview */
-		$preview = $entity;
-
-		$preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
-		$preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
-
-		return parent::update($preview);
-	}
-
-	#[Override]
-	public function delete(Entity $entity): Entity {
-		/** @var Preview $preview */
-		$preview = $entity;
-		if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
-			$qb = $this->db->getQueryBuilder();
-			$qb->delete(self::VERSION_TABLE_NAME)
-				->where($qb->expr()->eq('file_id', $qb->createNamedParameter($preview->getFileId())))
-				->andWhere($qb->expr()->eq('version', $qb->createNamedParameter($preview->getVersion())))
-				->executeStatement();
-		}
-
-		return parent::delete($entity);
-	}
-
-	/**
-	 * @return \Generator<Preview>
-	 * @throws Exception
-	 */
-	public function getAvailablePreviewsForFile(int $fileId): \Generator {
-		$selectQb = $this->db->getQueryBuilder();
-		$this->joinLocation($selectQb)
-			->where($selectQb->expr()->eq('p.file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-		yield from $this->yieldEntities($selectQb);
-	}
-
-	/**
-	 * @param int[] $fileIds
-	 * @return array<int, Preview[]>
-	 * @throws Exception
-	 */
-	public function getAvailablePreviews(array $fileIds): array {
-		$selectQb = $this->db->getQueryBuilder();
-		$this->joinLocation($selectQb)
-			->where(
-				$selectQb->expr()->in('p.file_id', $selectQb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)),
-			);
-		$previews = array_fill_keys($fileIds, []);
-		foreach ($this->yieldEntities($selectQb) as $preview) {
-			$previews[$preview->getFileId()][] = $preview;
-		}
-		return $previews;
-	}
-
-	/**
-	 * @return \Generator<Preview>
-	 */
-	public function getByFileId(int $fileId): \Generator {
-		$selectQb = $this->db->getQueryBuilder();
-		$this->joinLocation($selectQb)
-			->where($selectQb->expr()->eq('file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-		yield from $this->yieldEntities($selectQb);
-	}
-
-	/**
-	 * @param int[] $previewIds
-	 */
-	public function deleteByIds(array $previewIds): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete(self::TABLE_NAME)
-			->where($qb->expr()->andX(
-				$qb->expr()->in('id', $qb->createNamedParameter($previewIds, IQueryBuilder::PARAM_INT_ARRAY))
-			))->executeStatement();
-	}
-
-	protected function joinLocation(IQueryBuilder $qb): IQueryBuilder {
-		return $qb->select('p.*', 'l.bucket_name', 'l.object_store_name', 'v.version')
-			->from(self::TABLE_NAME, 'p')
-			->leftJoin('p', self::LOCATION_TABLE_NAME, 'l', $qb->expr()->eq(
-				'p.location_id', 'l.id'
-			))
-			->leftJoin('p', self::VERSION_TABLE_NAME, 'v', $qb->expr()->eq(
-				'p.version_id', 'v.id'
-			));
-	}
-
-	public function getLocationId(string $bucket, string $objectStore): int {
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('id')
-			->from(self::LOCATION_TABLE_NAME)
-			->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($bucket)))
-			->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($objectStore)))
-			->executeQuery();
-		$data = $result->fetchOne();
-		if ($data) {
-			return $data;
-		} else {
-			$qb->insert(self::LOCATION_TABLE_NAME)
-				->values([
-					'bucket_name' => $qb->createNamedParameter($bucket),
-					'object_store_name' => $qb->createNamedParameter($objectStore),
-				])->executeStatement();
-			return $qb->getLastInsertId();
-		}
-	}
-
-	public function deleteAll(): void {
-		$delete = $this->db->getQueryBuilder();
-		$delete->delete($this->getTableName());
-	}
-
-	/**
-	 * @return \Generator<Preview>
-	 */
-	public function getPreviews(int $lastId, int $limit = 1000): \Generator {
-		$qb = $this->db->getQueryBuilder();
-		$this->joinLocation($qb)
-			->where($qb->expr()->gt('p.id', $qb->createNamedParameter($lastId, IQueryBuilder::PARAM_INT)))
-			->setMaxResults($limit);
-		return $this->yieldEntities($qb);
-
-	}
-
-	/**
-	 * @param string[] $mimeTypes
-	 * @return \Generator<Preview>
-	 */
-	public function getPreviewsForMimeTypes(array $mimeTypes): \Generator {
-		$qb = $this->db->getQueryBuilder();
-		$this->joinLocation($qb)
-			->where($qb->expr()->orX(
-				...array_map(function (string $mimeType) use ($qb): string {
-					return $qb->expr()->eq('source_mimetype_id', $qb->createNamedParameter($this->mimeTypeLoader->getId($mimeType), IQueryBuilder::PARAM_INT));
-				}, $mimeTypes)
-			));
-		return $this->yieldEntities($qb);
-	}
+    private const TABLE_NAME = 'previews';
+    private const LOCATION_TABLE_NAME = 'preview_locations';
+    private const VERSION_TABLE_NAME = 'preview_versions';
+
+    public function __construct(
+        IDBConnection $db,
+        private readonly IMimeTypeLoader $mimeTypeLoader,
+    ) {
+        parent::__construct($db, self::TABLE_NAME, Preview::class);
+    }
+
+    protected function mapRowToEntity(array $row): Entity {
+        $row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype_id']);
+        $row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['source_mimetype_id']);
+
+        return parent::mapRowToEntity($row);
+    }
+
+    #[Override]
+    public function insert(Entity $entity): Entity {
+        /** @var Preview $preview */
+        $preview = $entity;
+
+        $preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
+        $preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
+
+        if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
+            $qb = $this->db->getQueryBuilder();
+            $qb->insert(self::VERSION_TABLE_NAME)
+                ->values([
+                    'version' => $preview->getVersion(),
+                    'file_id' => $preview->getFileId(),
+                ])
+                ->executeStatement();
+            $entity->setVersionId($qb->getLastInsertId());
+        }
+        return parent::insert($preview);
+    }
+
+    #[Override]
+    public function update(Entity $entity): Entity {
+        /** @var Preview $preview */
+        $preview = $entity;
+
+        $preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
+        $preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
+
+        return parent::update($preview);
+    }
+
+    #[Override]
+    public function delete(Entity $entity): Entity {
+        /** @var Preview $preview */
+        $preview = $entity;
+        if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
+            $qb = $this->db->getQueryBuilder();
+            $qb->delete(self::VERSION_TABLE_NAME)
+                ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($preview->getFileId())))
+                ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter($preview->getVersion())))
+                ->executeStatement();
+        }
+
+        return parent::delete($entity);
+    }
+
+    /**
+     * @return \Generator<Preview>
+     * @throws Exception
+     */
+    public function getAvailablePreviewsForFile(int $fileId): \Generator {
+        $selectQb = $this->db->getQueryBuilder();
+        $this->joinLocation($selectQb)
+            ->where($selectQb->expr()->eq('p.file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+        yield from $this->yieldEntities($selectQb);
+    }
+
+    /**
+     * @param int[] $fileIds
+     * @return array<int, Preview[]>
+     * @throws Exception
+     */
+    public function getAvailablePreviews(array $fileIds): array {
+        $selectQb = $this->db->getQueryBuilder();
+        $this->joinLocation($selectQb)
+            ->where(
+                $selectQb->expr()->in('p.file_id', $selectQb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)),
+            );
+        $previews = array_fill_keys($fileIds, []);
+        foreach ($this->yieldEntities($selectQb) as $preview) {
+            $previews[$preview->getFileId()][] = $preview;
+        }
+        return $previews;
+    }
+
+    /**
+     * @return \Generator<Preview>
+     */
+    public function getByFileId(int $fileId): \Generator {
+        $selectQb = $this->db->getQueryBuilder();
+        $this->joinLocation($selectQb)
+            ->where($selectQb->expr()->eq('file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+        yield from $this->yieldEntities($selectQb);
+    }
+
+    /**
+     * @param int[] $previewIds
+     */
+    public function deleteByIds(array $previewIds): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete(self::TABLE_NAME)
+            ->where($qb->expr()->andX(
+                $qb->expr()->in('id', $qb->createNamedParameter($previewIds, IQueryBuilder::PARAM_INT_ARRAY))
+            ))->executeStatement();
+    }
+
+    protected function joinLocation(IQueryBuilder $qb): IQueryBuilder {
+        return $qb->select('p.*', 'l.bucket_name', 'l.object_store_name', 'v.version')
+            ->from(self::TABLE_NAME, 'p')
+            ->leftJoin('p', self::LOCATION_TABLE_NAME, 'l', $qb->expr()->eq(
+                'p.location_id', 'l.id'
+            ))
+            ->leftJoin('p', self::VERSION_TABLE_NAME, 'v', $qb->expr()->eq(
+                'p.version_id', 'v.id'
+            ));
+    }
+
+    public function getLocationId(string $bucket, string $objectStore): int {
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('id')
+            ->from(self::LOCATION_TABLE_NAME)
+            ->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($bucket)))
+            ->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($objectStore)))
+            ->executeQuery();
+        $data = $result->fetchOne();
+        if ($data) {
+            return $data;
+        } else {
+            $qb->insert(self::LOCATION_TABLE_NAME)
+                ->values([
+                    'bucket_name' => $qb->createNamedParameter($bucket),
+                    'object_store_name' => $qb->createNamedParameter($objectStore),
+                ])->executeStatement();
+            return $qb->getLastInsertId();
+        }
+    }
+
+    public function deleteAll(): void {
+        $delete = $this->db->getQueryBuilder();
+        $delete->delete($this->getTableName());
+    }
+
+    /**
+     * @return \Generator<Preview>
+     */
+    public function getPreviews(int $lastId, int $limit = 1000): \Generator {
+        $qb = $this->db->getQueryBuilder();
+        $this->joinLocation($qb)
+            ->where($qb->expr()->gt('p.id', $qb->createNamedParameter($lastId, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults($limit);
+        return $this->yieldEntities($qb);
+
+    }
+
+    /**
+     * @param string[] $mimeTypes
+     * @return \Generator<Preview>
+     */
+    public function getPreviewsForMimeTypes(array $mimeTypes): \Generator {
+        $qb = $this->db->getQueryBuilder();
+        $this->joinLocation($qb)
+            ->where($qb->expr()->orX(
+                ...array_map(function (string $mimeType) use ($qb): string {
+                    return $qb->expr()->eq('source_mimetype_id', $qb->createNamedParameter($this->mimeTypeLoader->getId($mimeType), IQueryBuilder::PARAM_INT));
+                }, $mimeTypes)
+            ));
+        return $this->yieldEntities($qb);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@ 
 	}
 
 	protected function mapRowToEntity(array $row): Entity {
-		$row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype_id']);
-		$row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['source_mimetype_id']);
+		$row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int) $row['mimetype_id']);
+		$row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int) $row['source_mimetype_id']);
 
 		return parent::mapRowToEntity($row);
 	}
@@ -193,7 +193,7 @@ 
 		$qb = $this->db->getQueryBuilder();
 		$this->joinLocation($qb)
 			->where($qb->expr()->orX(
-				...array_map(function (string $mimeType) use ($qb): string {
+				...array_map(function(string $mimeType) use ($qb): string {
 					return $qb->expr()->eq('source_mimetype_id', $qb->createNamedParameter($this->mimeTypeLoader->getId($mimeType), IQueryBuilder::PARAM_INT));
 				}, $mimeTypes)
 			));

lib/private/Preview/Db/Preview.php

Indentation +122 added lines, -122 removed lines

@@ -54,126 +54,126 @@
  * @see PreviewMapper
  */
 class Preview extends Entity {
-	protected ?int $fileId = null;
-	protected ?int $oldFileId = null;
-	protected ?int $storageId = null;
-	protected ?int $locationId = null;
-	protected ?string $bucketName = null;
-	protected ?string $objectStoreName = null;
-	protected ?int $width = null;
-	protected ?int $height = null;
-	protected ?int $mimetypeId = null;
-	protected ?int $sourceMimetypeId = null;
-	protected string $mimetype = 'application/octet-stream';
-	protected string $sourceMimetype = 'application/octet-stream';
-	protected ?int $mtime = null;
-	protected ?int $size = null;
-	protected ?bool $max = null;
-	protected ?bool $cropped = null;
-	protected ?string $etag = null;
-	protected ?string $version = null;
-	protected ?int $versionId = null;
-	protected ?bool $encrypted = null;
-
-	public function __construct() {
-		$this->addType('fileId', Types::BIGINT);
-		$this->addType('storageId', Types::BIGINT);
-		$this->addType('oldFileId', Types::BIGINT);
-		$this->addType('locationId', Types::BIGINT);
-		$this->addType('width', Types::INTEGER);
-		$this->addType('height', Types::INTEGER);
-		$this->addType('mimetypeId', Types::INTEGER);
-		$this->addType('sourceMimetypeId', Types::INTEGER);
-		$this->addType('mtime', Types::INTEGER);
-		$this->addType('size', Types::INTEGER);
-		$this->addType('max', Types::BOOLEAN);
-		$this->addType('cropped', Types::BOOLEAN);
-		$this->addType('encrypted', Types::BOOLEAN);
-		$this->addType('etag', Types::STRING);
-		$this->addType('versionId', Types::STRING);
-	}
-
-	public static function fromPath(string $path, IMimeTypeDetector $mimeTypeDetector): Preview|false {
-		$preview = new self();
-		$preview->setFileId((int)basename(dirname($path)));
-
-		$fileName = pathinfo($path, PATHINFO_FILENAME) . '.' . pathinfo($path, PATHINFO_EXTENSION);
-		$ok = preg_match('/(([A-Za-z0-9\+\/]+)-)?([0-9]+)-([0-9]+)(-(max))?(-(crop))?\.([a-z]{3,4})/', $fileName, $matches);
-
-		if ($ok !== 1) {
-			return false;
-		}
-
-		[
-			2 => $version,
-			3 => $width,
-			4 => $height,
-			6 => $max,
-			8 => $crop,
-		] = $matches;
-
-		$preview->setMimeType($mimeTypeDetector->detectPath($fileName));
-
-		$preview->setWidth((int)$width);
-		$preview->setHeight((int)$height);
-		$preview->setCropped($crop === 'crop');
-		$preview->setMax($max === 'max');
-
-		if (!empty($version)) {
-			$preview->setVersion($version);
-		}
-		return $preview;
-	}
-
-	public function getName(): string {
-		$path = ($this->getVersion() > -1 ? $this->getVersion() . '-' : '') . $this->getWidth() . '-' . $this->getHeight();
-		if ($this->isCropped()) {
-			$path .= '-crop';
-		}
-		if ($this->isMax()) {
-			$path .= '-max';
-		}
-
-		$ext = $this->getExtension();
-		$path .= '.' . $ext;
-		return $path;
-	}
-
-	public function getExtension(): string {
-		return match ($this->getMimeType()) {
-			'image/png' => 'png',
-			'image/gif' => 'gif',
-			'image/jpeg' => 'jpg',
-			'image/webp' => 'webp',
-			default => 'png',
-		};
-	}
-
-	public function setBucketName(string $bucketName): void {
-		$this->bucketName = $bucketName;
-	}
-
-	public function setObjectStoreName(string $objectStoreName): void {
-		$this->objectStoreName = $objectStoreName;
-	}
-
-	public function setVersion(?string $version): void {
-		$this->version = $version;
-	}
-
-	public function getMimeType(): string {
-		return $this->mimetype;
-	}
-
-	public function setMimeType(string $mimeType): void {
-		$this->mimetype = $mimeType;
-	}
-
-	public function getSourceMimeType(): string {
-		return $this->sourceMimetype;
-	}
-
-	public function setSourceMimeType(string $mimeType): void {
-		$this->sourceMimetype = $mimeType;
-	}
+    protected ?int $fileId = null;
+    protected ?int $oldFileId = null;
+    protected ?int $storageId = null;
+    protected ?int $locationId = null;
+    protected ?string $bucketName = null;
+    protected ?string $objectStoreName = null;
+    protected ?int $width = null;
+    protected ?int $height = null;
+    protected ?int $mimetypeId = null;
+    protected ?int $sourceMimetypeId = null;
+    protected string $mimetype = 'application/octet-stream';
+    protected string $sourceMimetype = 'application/octet-stream';
+    protected ?int $mtime = null;
+    protected ?int $size = null;
+    protected ?bool $max = null;
+    protected ?bool $cropped = null;
+    protected ?string $etag = null;
+    protected ?string $version = null;
+    protected ?int $versionId = null;
+    protected ?bool $encrypted = null;
+
+    public function __construct() {
+        $this->addType('fileId', Types::BIGINT);
+        $this->addType('storageId', Types::BIGINT);
+        $this->addType('oldFileId', Types::BIGINT);
+        $this->addType('locationId', Types::BIGINT);
+        $this->addType('width', Types::INTEGER);
+        $this->addType('height', Types::INTEGER);
+        $this->addType('mimetypeId', Types::INTEGER);
+        $this->addType('sourceMimetypeId', Types::INTEGER);
+        $this->addType('mtime', Types::INTEGER);
+        $this->addType('size', Types::INTEGER);
+        $this->addType('max', Types::BOOLEAN);
+        $this->addType('cropped', Types::BOOLEAN);
+        $this->addType('encrypted', Types::BOOLEAN);
+        $this->addType('etag', Types::STRING);
+        $this->addType('versionId', Types::STRING);
+    }
+
+    public static function fromPath(string $path, IMimeTypeDetector $mimeTypeDetector): Preview|false {
+        $preview = new self();
+        $preview->setFileId((int)basename(dirname($path)));
+
+        $fileName = pathinfo($path, PATHINFO_FILENAME) . '.' . pathinfo($path, PATHINFO_EXTENSION);
+        $ok = preg_match('/(([A-Za-z0-9\+\/]+)-)?([0-9]+)-([0-9]+)(-(max))?(-(crop))?\.([a-z]{3,4})/', $fileName, $matches);
+
+        if ($ok !== 1) {
+            return false;
+        }
+
+        [
+            2 => $version,
+            3 => $width,
+            4 => $height,
+            6 => $max,
+            8 => $crop,
+        ] = $matches;
+
+        $preview->setMimeType($mimeTypeDetector->detectPath($fileName));
+
+        $preview->setWidth((int)$width);
+        $preview->setHeight((int)$height);
+        $preview->setCropped($crop === 'crop');
+        $preview->setMax($max === 'max');
+
+        if (!empty($version)) {
+            $preview->setVersion($version);
+        }
+        return $preview;
+    }
+
+    public function getName(): string {
+        $path = ($this->getVersion() > -1 ? $this->getVersion() . '-' : '') . $this->getWidth() . '-' . $this->getHeight();
+        if ($this->isCropped()) {
+            $path .= '-crop';
+        }
+        if ($this->isMax()) {
+            $path .= '-max';
+        }
+
+        $ext = $this->getExtension();
+        $path .= '.' . $ext;
+        return $path;
+    }
+
+    public function getExtension(): string {
+        return match ($this->getMimeType()) {
+            'image/png' => 'png',
+            'image/gif' => 'gif',
+            'image/jpeg' => 'jpg',
+            'image/webp' => 'webp',
+            default => 'png',
+        };
+    }
+
+    public function setBucketName(string $bucketName): void {
+        $this->bucketName = $bucketName;
+    }
+
+    public function setObjectStoreName(string $objectStoreName): void {
+        $this->objectStoreName = $objectStoreName;
+    }
+
+    public function setVersion(?string $version): void {
+        $this->version = $version;
+    }
+
+    public function getMimeType(): string {
+        return $this->mimetype;
+    }
+
+    public function setMimeType(string $mimeType): void {
+        $this->mimetype = $mimeType;
+    }
+
+    public function getSourceMimeType(): string {
+        return $this->sourceMimetype;
+    }
+
+    public function setSourceMimeType(string $mimeType): void {
+        $this->sourceMimetype = $mimeType;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -93,11 +93,11 @@ 
 		$this->addType('versionId', Types::STRING);
 	}
 
-	public static function fromPath(string $path, IMimeTypeDetector $mimeTypeDetector): Preview|false {
+	public static function fromPath(string $path, IMimeTypeDetector $mimeTypeDetector): Preview | false {
 		$preview = new self();
-		$preview->setFileId((int)basename(dirname($path)));
+		$preview->setFileId((int) basename(dirname($path)));
 
-		$fileName = pathinfo($path, PATHINFO_FILENAME) . '.' . pathinfo($path, PATHINFO_EXTENSION);
+		$fileName = pathinfo($path, PATHINFO_FILENAME).'.'.pathinfo($path, PATHINFO_EXTENSION);
 		$ok = preg_match('/(([A-Za-z0-9\+\/]+)-)?([0-9]+)-([0-9]+)(-(max))?(-(crop))?\.([a-z]{3,4})/', $fileName, $matches);
 
 		if ($ok !== 1) {
@@ -114,8 +114,8 @@ 
 
 		$preview->setMimeType($mimeTypeDetector->detectPath($fileName));
 
-		$preview->setWidth((int)$width);
-		$preview->setHeight((int)$height);
+		$preview->setWidth((int) $width);
+		$preview->setHeight((int) $height);
 		$preview->setCropped($crop === 'crop');
 		$preview->setMax($max === 'max');
 
@@ -126,7 +126,7 @@ 
 	}
 
 	public function getName(): string {
-		$path = ($this->getVersion() > -1 ? $this->getVersion() . '-' : '') . $this->getWidth() . '-' . $this->getHeight();
+		$path = ($this->getVersion() > -1 ? $this->getVersion().'-' : '').$this->getWidth().'-'.$this->getHeight();
 		if ($this->isCropped()) {
 			$path .= '-crop';
 		}
@@ -135,7 +135,7 @@ 
 		}
 
 		$ext = $this->getExtension();
-		$path .= '.' . $ext;
+		$path .= '.'.$ext;
 		return $path;
 	}
 

lib/private/Preview/PreviewService.php

Indentation +90 added lines, -90 removed lines

@@ -16,94 +16,94 @@
 use OCP\IDBConnection;
 
 class PreviewService {
-	public function __construct(
-		private readonly StorageFactory $storageFactory,
-		private readonly PreviewMapper $previewMapper,
-		private readonly IDBConnection $connection,
-	) {
-	}
-
-	public function deletePreview(Preview $preview): void {
-		$this->storageFactory->deletePreview($preview);
-		$this->previewMapper->delete($preview);
-	}
-
-	/**
-	 * Get storageId and fileIds for which we have at least one preview.
-	 *
-	 * @return \Generator<array{storageId: int, fileIds: int[]}>
-	 */
-	public function getAvailableFileIds(): \Generator {
-		$maxQb = $this->connection->getQueryBuilder();
-		$maxQb->select($maxQb->func()->max('id'))
-			->from($this->previewMapper->getTableName())
-			->groupBy('file_id');
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('file_id', 'storage_id')
-			->from($this->previewMapper->getTableName())
-			->where($qb->expr()->in('id', $qb->createFunction($maxQb->getSQL())));
-
-		$result = $qb->executeQuery();
-
-		$lastStorageId = -1;
-		/** @var int[] $fileIds */
-		$fileIds = [];
-
-		// Previews next to each others in the database are likely in the same storage, so group them
-		while ($row = $result->fetch()) {
-			if ($lastStorageId !== $row['storage_id']) {
-				if ($lastStorageId !== -1) {
-					yield ['storageId' => $lastStorageId, 'fileIds' => $fileIds];
-					$fileIds = [];
-				}
-				$lastStorageId = (int)$row['storage_id'];
-			}
-			$fileIds[] = (int)$row['file_id'];
-		}
-
-		if (count($fileIds) > 0) {
-			yield ['storageId' => $lastStorageId, 'fileIds' => $fileIds];
-		}
-	}
-
-	/**
-	 * @return \Generator<Preview>
-	 */
-	public function getAvailablePreviewsForFile(int $fileId): \Generator {
-		return $this->previewMapper->getAvailablePreviewsForFile($fileId);
-	}
-
-	/**
-	 * @param string[] $mimeTypes
-	 * @return \Generator<Preview>
-	 */
-	public function getPreviewsForMimeTypes(array $mimeTypes): \Generator {
-		return $this->previewMapper->getPreviewsForMimeTypes($mimeTypes);
-	}
-
-	public function deleteAll(): void {
-		$lastId = 0;
-		while (true) {
-			$previews = $this->previewMapper->getPreviews($lastId, 1000);
-			$i = 0;
-			foreach ($previews as $preview) {
-				$this->deletePreview($preview);
-				$i++;
-				$lastId = $preview->getId();
-			}
-
-			if ($i !== 1000) {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * @param int[] $fileIds
-	 * @return array<int, Preview[]>
-	 */
-	public function getAvailablePreviews(array $fileIds): array {
-		return $this->previewMapper->getAvailablePreviews($fileIds);
-	}
+    public function __construct(
+        private readonly StorageFactory $storageFactory,
+        private readonly PreviewMapper $previewMapper,
+        private readonly IDBConnection $connection,
+    ) {
+    }
+
+    public function deletePreview(Preview $preview): void {
+        $this->storageFactory->deletePreview($preview);
+        $this->previewMapper->delete($preview);
+    }
+
+    /**
+     * Get storageId and fileIds for which we have at least one preview.
+     *
+     * @return \Generator<array{storageId: int, fileIds: int[]}>
+     */
+    public function getAvailableFileIds(): \Generator {
+        $maxQb = $this->connection->getQueryBuilder();
+        $maxQb->select($maxQb->func()->max('id'))
+            ->from($this->previewMapper->getTableName())
+            ->groupBy('file_id');
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('file_id', 'storage_id')
+            ->from($this->previewMapper->getTableName())
+            ->where($qb->expr()->in('id', $qb->createFunction($maxQb->getSQL())));
+
+        $result = $qb->executeQuery();
+
+        $lastStorageId = -1;
+        /** @var int[] $fileIds */
+        $fileIds = [];
+
+        // Previews next to each others in the database are likely in the same storage, so group them
+        while ($row = $result->fetch()) {
+            if ($lastStorageId !== $row['storage_id']) {
+                if ($lastStorageId !== -1) {
+                    yield ['storageId' => $lastStorageId, 'fileIds' => $fileIds];
+                    $fileIds = [];
+                }
+                $lastStorageId = (int)$row['storage_id'];
+            }
+            $fileIds[] = (int)$row['file_id'];
+        }
+
+        if (count($fileIds) > 0) {
+            yield ['storageId' => $lastStorageId, 'fileIds' => $fileIds];
+        }
+    }
+
+    /**
+     * @return \Generator<Preview>
+     */
+    public function getAvailablePreviewsForFile(int $fileId): \Generator {
+        return $this->previewMapper->getAvailablePreviewsForFile($fileId);
+    }
+
+    /**
+     * @param string[] $mimeTypes
+     * @return \Generator<Preview>
+     */
+    public function getPreviewsForMimeTypes(array $mimeTypes): \Generator {
+        return $this->previewMapper->getPreviewsForMimeTypes($mimeTypes);
+    }
+
+    public function deleteAll(): void {
+        $lastId = 0;
+        while (true) {
+            $previews = $this->previewMapper->getPreviews($lastId, 1000);
+            $i = 0;
+            foreach ($previews as $preview) {
+                $this->deletePreview($preview);
+                $i++;
+                $lastId = $preview->getId();
+            }
+
+            if ($i !== 1000) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * @param int[] $fileIds
+     * @return array<int, Preview[]>
+     */
+    public function getAvailablePreviews(array $fileIds): array {
+        return $this->previewMapper->getAvailablePreviews($fileIds);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -57,9 +57,9 @@
 					yield ['storageId' => $lastStorageId, 'fileIds' => $fileIds];
 					$fileIds = [];
 				}
-				$lastStorageId = (int)$row['storage_id'];
+				$lastStorageId = (int) $row['storage_id'];
 			}
-			$fileIds[] = (int)$row['file_id'];
+			$fileIds[] = (int) $row['file_id'];
 		}
 
 		if (count($fileIds) > 0) {

lib/private/Preview/BackgroundCleanupJob.php

Indentation +64 added lines, -64 removed lines

@@ -20,42 +20,42 @@ 
  */
 class BackgroundCleanupJob extends TimedJob {
 
-	public function __construct(
-		ITimeFactory $timeFactory,
-		readonly private IDBConnection $connection,
-		readonly private PreviewService $previewService,
-		readonly private bool $isCLI,
-	) {
-		parent::__construct($timeFactory);
-		// Run at most once an hour
-		$this->setInterval(60 * 60);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
+    public function __construct(
+        ITimeFactory $timeFactory,
+        readonly private IDBConnection $connection,
+        readonly private PreviewService $previewService,
+        readonly private bool $isCLI,
+    ) {
+        parent::__construct($timeFactory);
+        // Run at most once an hour
+        $this->setInterval(60 * 60);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
 
-	public function run($argument): void {
-		foreach ($this->getDeletedFiles() as $fileId) {
-			$previewIds = [];
-			foreach ($this->previewService->getAvailablePreviewsForFile($fileId) as $preview) {
-				$this->previewService->deletePreview($preview);
-			}
-		}
-	}
+    public function run($argument): void {
+        foreach ($this->getDeletedFiles() as $fileId) {
+            $previewIds = [];
+            foreach ($this->previewService->getAvailablePreviewsForFile($fileId) as $preview) {
+                $this->previewService->deletePreview($preview);
+            }
+        }
+    }
 
-	/**
-	 * @return \Iterator<FileId>
-	 */
-	private function getDeletedFiles(): \Iterator {
-		if ($this->connection->getShardDefinition('filecache')) {
-			foreach ($this->previewService->getAvailableFileIds() as $availableFileIdGroup) {
-				$fileIds = $this->findMissingSources($availableFileIdGroup['storageId'], $availableFileIdGroup['fileIds']);
-				foreach ($fileIds as $fileId) {
-					yield $fileId;
-				}
-			}
-			return;
-		}
+    /**
+     * @return \Iterator<FileId>
+     */
+    private function getDeletedFiles(): \Iterator {
+        if ($this->connection->getShardDefinition('filecache')) {
+            foreach ($this->previewService->getAvailableFileIds() as $availableFileIdGroup) {
+                $fileIds = $this->findMissingSources($availableFileIdGroup['storageId'], $availableFileIdGroup['fileIds']);
+                foreach ($fileIds as $fileId) {
+                    yield $fileId;
+                }
+            }
+            return;
+        }
 
-		/*
+        /*
 		 * Deleting a file will not delete related previews right away.
 		 *
 		 * A delete request is usually an HTTP request.
@@ -70,38 +70,38 @@ 
 		 *
 		 * If the related file is deleted, b.fileid will be null and the preview folder can be deleted.
 		 */
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('p.file_id')
-			->from('previews', 'p')
-			->leftJoin('p', 'filecache', 'f', $qb->expr()->eq(
-				'p.file_id', 'f.fileid'
-			))
-			->where($qb->expr()->isNull('f.fileid'));
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('p.file_id')
+            ->from('previews', 'p')
+            ->leftJoin('p', 'filecache', 'f', $qb->expr()->eq(
+                'p.file_id', 'f.fileid'
+            ))
+            ->where($qb->expr()->isNull('f.fileid'));
 
-		if (!$this->isCLI) {
-			$qb->setMaxResults(10);
-		}
+        if (!$this->isCLI) {
+            $qb->setMaxResults(10);
+        }
 
-		$cursor = $qb->executeQuery();
-		while ($row = $cursor->fetch()) {
-			yield (int)$row['file_id'];
-		}
-		$cursor->closeCursor();
-	}
+        $cursor = $qb->executeQuery();
+        while ($row = $cursor->fetch()) {
+            yield (int)$row['file_id'];
+        }
+        $cursor->closeCursor();
+    }
 
-	/**
-	 * @param FileId[] $ids
-	 * @return FileId[]
-	 */
-	private function findMissingSources(int $storage, array $ids): array {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('fileid')
-			->from('filecache')
-			->where($qb->expr()->andX(
-				$qb->expr()->in('fileid', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)),
-				$qb->expr()->eq('storage', $qb->createNamedParameter($storage, IQueryBuilder::PARAM_INT)),
-			));
-		$found = $qb->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
-		return array_diff($ids, $found);
-	}
+    /**
+     * @param FileId[] $ids
+     * @return FileId[]
+     */
+    private function findMissingSources(int $storage, array $ids): array {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('fileid')
+            ->from('filecache')
+            ->where($qb->expr()->andX(
+                $qb->expr()->in('fileid', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)),
+                $qb->expr()->eq('storage', $qb->createNamedParameter($storage, IQueryBuilder::PARAM_INT)),
+            ));
+        $found = $qb->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
+        return array_diff($ids, $found);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 
 		$cursor = $qb->executeQuery();
 		while ($row = $cursor->fetch()) {
-			yield (int)$row['file_id'];
+			yield (int) $row['file_id'];
 		}
 		$cursor->closeCursor();
 	}

lib/private/Preview/GeneratorHelper.php

Indentation +38 added lines, -38 removed lines

@@ -19,47 +19,47 @@
  * Very small wrapper class to make the generator fully unit testable
  */
 class GeneratorHelper {
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IRootFolder $rootFolder, IConfig $config) {
-		$this->rootFolder = $rootFolder;
-		$this->config = $config;
-	}
+    public function __construct(IRootFolder $rootFolder, IConfig $config) {
+        $this->rootFolder = $rootFolder;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param IProviderV2 $provider
-	 * @param File $file
-	 * @param int $maxWidth
-	 * @param int $maxHeight
-	 *
-	 * @return bool|IImage
-	 */
-	public function getThumbnail(IProviderV2 $provider, File $file, $maxWidth, $maxHeight, bool $crop = false) {
-		if ($provider instanceof Imaginary) {
-			return $provider->getCroppedThumbnail($file, $maxWidth, $maxHeight, $crop) ?? false;
-		}
-		return $provider->getThumbnail($file, $maxWidth, $maxHeight) ?? false;
-	}
+    /**
+     * @param IProviderV2 $provider
+     * @param File $file
+     * @param int $maxWidth
+     * @param int $maxHeight
+     *
+     * @return bool|IImage
+     */
+    public function getThumbnail(IProviderV2 $provider, File $file, $maxWidth, $maxHeight, bool $crop = false) {
+        if ($provider instanceof Imaginary) {
+            return $provider->getCroppedThumbnail($file, $maxWidth, $maxHeight, $crop) ?? false;
+        }
+        return $provider->getThumbnail($file, $maxWidth, $maxHeight) ?? false;
+    }
 
-	public function getImage(ISimpleFile $maxPreview): IImage {
-		$image = new OCPImage();
-		$image->loadFromData($maxPreview->getContent());
-		return $image;
-	}
+    public function getImage(ISimpleFile $maxPreview): IImage {
+        $image = new OCPImage();
+        $image->loadFromData($maxPreview->getContent());
+        return $image;
+    }
 
-	/**
-	 * @param callable $providerClosure
-	 * @return IProviderV2
-	 */
-	public function getProvider($providerClosure) {
-		$provider = $providerClosure();
-		if ($provider instanceof IProvider) {
-			$provider = new ProviderV1Adapter($provider);
-		}
-		return $provider;
-	}
+    /**
+     * @param callable $providerClosure
+     * @return IProviderV2
+     */
+    public function getProvider($providerClosure) {
+        $provider = $providerClosure();
+        if ($provider instanceof IProvider) {
+            $provider = new ProviderV1Adapter($provider);
+        }
+        return $provider;
+    }
 }

lib/private/Preview/Generator.php

Indentation +512 added lines, -512 removed lines

@@ -27,530 +27,530 @@
 use Psr\Log\LoggerInterface;
 
 class Generator {
-	public const SEMAPHORE_ID_ALL = 0x0a11;
-	public const SEMAPHORE_ID_NEW = 0x07ea;
-
-	public function __construct(
-		private IConfig $config,
-		private IPreview $previewManager,
-		private GeneratorHelper $helper,
-		private IEventDispatcher $eventDispatcher,
-		private LoggerInterface $logger,
-		private PreviewMapper $previewMapper,
-		private StorageFactory $storageFactory,
-	) {
-	}
-
-	/**
-	 * Returns a preview of a file
-	 *
-	 * The cache is searched first and if nothing usable was found then a preview is
-	 * generated by one of the providers
-	 *
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 */
-	public function getPreview(
-		File $file,
-		int $width = -1,
-		int $height = -1,
-		bool $crop = false,
-		string $mode = IPreview::MODE_FILL,
-		?string $mimeType = null,
-		bool $cacheResult = true,
-	): ISimpleFile {
-		$specification = [
-			'width' => $width,
-			'height' => $height,
-			'crop' => $crop,
-			'mode' => $mode,
-		];
-
-		$this->eventDispatcher->dispatchTyped(new BeforePreviewFetchedEvent(
-			$file,
-			$width,
-			$height,
-			$crop,
-			$mode,
-			$mimeType,
-		));
-
-		$this->logger->debug('Requesting preview for {path} with width={width}, height={height}, crop={crop}, mode={mode}, mimeType={mimeType}', [
-			'path' => $file->getPath(),
-			'width' => $width,
-			'height' => $height,
-			'crop' => $crop,
-			'mode' => $mode,
-			'mimeType' => $mimeType,
-		]);
-
-
-		// since we only ask for one preview, and the generate method return the last one it created, it returns the one we want
-		return $this->generatePreviews($file, [$specification], $mimeType, $cacheResult);
-	}
-
-	/**
-	 * Generates previews of a file
-	 *
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 */
-	public function generatePreviews(File $file, array $specifications, ?string $mimeType = null, bool $cacheResult = true): ISimpleFile {
-		//Make sure that we can read the file
-		if (!$file->isReadable()) {
-			$this->logger->warning('Cannot read file: {path}, skipping preview generation.', ['path' => $file->getPath()]);
-			throw new NotFoundException('Cannot read file');
-		}
-
-		if ($mimeType === null) {
-			$mimeType = $file->getMimeType();
-		}
-
-		[$file->getId() => $previews] = $this->previewMapper->getAvailablePreviews([$file->getId()]);
-
-		$previewVersion = null;
-		if ($file instanceof IVersionedPreviewFile) {
-			$previewVersion = $file->getPreviewVersion();
-		}
-
-		// Get the max preview and infer the max preview sizes from that
-		$maxPreview = $this->getMaxPreview($previews, $file, $mimeType, $previewVersion);
-		$maxPreviewImage = null; // only load the image when we need it
-		if ($maxPreview->getSize() === 0) {
-			$this->storageFactory->deletePreview($maxPreview);
-			$this->previewMapper->delete($maxPreview);
-			$this->logger->error('Max preview generated for file {path} has size 0, deleting and throwing exception.', ['path' => $file->getPath()]);
-			throw new NotFoundException('Max preview size 0, invalid!');
-		}
-
-		$maxWidth = $maxPreview->getWidth();
-		$maxHeight = $maxPreview->getHeight();
-
-		if ($maxWidth <= 0 || $maxHeight <= 0) {
-			throw new NotFoundException('The maximum preview sizes are zero or less pixels');
-		}
-
-		$previewFile = null;
-		foreach ($specifications as $specification) {
-			$width = $specification['width'] ?? -1;
-			$height = $specification['height'] ?? -1;
-			$crop = $specification['crop'] ?? false;
-			$mode = $specification['mode'] ?? IPreview::MODE_FILL;
-
-			// If both width and height are -1 we just want the max preview
-			if ($width === -1 && $height === -1) {
-				$width = $maxWidth;
-				$height = $maxHeight;
-			}
-
-			// Calculate the preview size
-			[$width, $height] = $this->calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight);
-
-			// No need to generate a preview that is just the max preview
-			if ($width === $maxWidth && $height === $maxHeight) {
-				// ensure correct return value if this was the last one
-				$previewFile = new PreviewFile($maxPreview, $this->storageFactory, $this->previewMapper);
-				continue;
-			}
-
-			// Try to get a cached preview. Else generate (and store) one
-			try {
-				$preview = array_find($previews, fn (Preview $preview): bool => $preview->getWidth() === $width
-					&& $preview->getHeight() === $height && $preview->getMimetype() === $maxPreview->getMimetype()
-					&& $preview->getVersion() === $previewVersion && $preview->isCropped() === $crop);
-
-				if ($preview) {
-					$previewFile = new PreviewFile($preview, $this->storageFactory, $this->previewMapper);
-				} else {
-					if (!$this->previewManager->isMimeSupported($mimeType)) {
-						throw new NotFoundException();
-					}
-
-					if ($maxPreviewImage === null) {
-						$maxPreviewImage = $this->helper->getImage(new PreviewFile($maxPreview, $this->storageFactory, $this->previewMapper));
-					}
-
-					$this->logger->debug('Cached preview not found for file {path}, generating a new preview.', ['path' => $file->getPath()]);
-					$previewFile = $this->generatePreview($file, $maxPreviewImage, $width, $height, $crop, $maxWidth, $maxHeight, $previewVersion, $cacheResult);
-				}
-			} catch (\InvalidArgumentException $e) {
-				throw new NotFoundException('', 0, $e);
-			}
-
-			if ($previewFile->getSize() === 0) {
-				$previewFile->delete();
-				throw new NotFoundException('Cached preview size 0, invalid!');
-			}
-		}
-		assert($previewFile !== null);
-
-		// Free memory being used by the embedded image resource.  Without this the image is kept in memory indefinitely.
-		// Garbage Collection does NOT free this memory.  We have to do it ourselves.
-		if ($maxPreviewImage instanceof \OCP\Image) {
-			$maxPreviewImage->destroy();
-		}
-
-		return $previewFile;
-	}
-
-	/**
-	 * Acquire a semaphore of the specified id and concurrency, blocking if necessary.
-	 * Return an identifier of the semaphore on success, which can be used to release it via
-	 * {@see Generator::unguardWithSemaphore()}.
-	 *
-	 * @param int $semId
-	 * @param int $concurrency
-	 * @return false|\SysvSemaphore the semaphore on success or false on failure
-	 */
-	public static function guardWithSemaphore(int $semId, int $concurrency) {
-		if (!extension_loaded('sysvsem')) {
-			return false;
-		}
-		$sem = sem_get($semId, $concurrency);
-		if ($sem === false) {
-			return false;
-		}
-		if (!sem_acquire($sem)) {
-			return false;
-		}
-		return $sem;
-	}
-
-	/**
-	 * Releases the semaphore acquired from {@see Generator::guardWithSemaphore()}.
-	 *
-	 * @param false|\SysvSemaphore $semId the semaphore identifier returned by guardWithSemaphore
-	 * @return bool
-	 */
-	public static function unguardWithSemaphore(false|\SysvSemaphore $semId): bool {
-		if ($semId === false || !($semId instanceof \SysvSemaphore)) {
-			return false;
-		}
-		return sem_release($semId);
-	}
-
-	/**
-	 * Get the number of concurrent threads supported by the host.
-	 *
-	 * @return int number of concurrent threads, or 0 if it cannot be determined
-	 */
-	public static function getHardwareConcurrency(): int {
-		static $width;
-
-		if (!isset($width)) {
-			if (function_exists('ini_get')) {
-				$openBasedir = ini_get('open_basedir');
-				if (empty($openBasedir) || strpos($openBasedir, '/proc/cpuinfo') !== false) {
-					$width = is_readable('/proc/cpuinfo') ? substr_count(file_get_contents('/proc/cpuinfo'), 'processor') : 0;
-				} else {
-					$width = 0;
-				}
-			} else {
-				$width = 0;
-			}
-		}
-		return $width;
-	}
-
-	/**
-	 * Get number of concurrent preview generations from system config
-	 *
-	 * Two config entries, `preview_concurrency_new` and `preview_concurrency_all`,
-	 * are available. If not set, the default values are determined with the hardware concurrency
-	 * of the host. In case the hardware concurrency cannot be determined, or the user sets an
-	 * invalid value, fallback values are:
-	 * For new images whose previews do not exist and need to be generated, 4;
-	 * For all preview generation requests, 8.
-	 * Value of `preview_concurrency_all` should be greater than or equal to that of
-	 * `preview_concurrency_new`, otherwise, the latter is returned.
-	 *
-	 * @param string $type either `preview_concurrency_new` or `preview_concurrency_all`
-	 * @return int number of concurrent preview generations, or -1 if $type is invalid
-	 */
-	public function getNumConcurrentPreviews(string $type): int {
-		static $cached = [];
-		if (array_key_exists($type, $cached)) {
-			return $cached[$type];
-		}
-
-		$hardwareConcurrency = self::getHardwareConcurrency();
-		switch ($type) {
-			case 'preview_concurrency_all':
-				$fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency * 2 : 8;
-				$concurrency_all = $this->config->getSystemValueInt($type, $fallback);
-				$concurrency_new = $this->getNumConcurrentPreviews('preview_concurrency_new');
-				$cached[$type] = max($concurrency_all, $concurrency_new);
-				break;
-			case 'preview_concurrency_new':
-				$fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency : 4;
-				$cached[$type] = $this->config->getSystemValueInt($type, $fallback);
-				break;
-			default:
-				return -1;
-		}
-		return $cached[$type];
-	}
-
-	/**
-	 * @param Preview[] $previews
-	 * @throws NotFoundException
-	 */
-	private function getMaxPreview(array $previews, File $file, string $mimeType, ?string $version): Preview {
-		// We don't know the max preview size, so we can't use getCachedPreview.
-		// It might have been generated with a higher resolution than the current value.
-		foreach ($previews as $preview) {
-			if ($preview->isMax() && ($version === $preview->getVersion())) {
-				return $preview;
-			}
-		}
-
-		$maxWidth = $this->config->getSystemValueInt('preview_max_x', 4096);
-		$maxHeight = $this->config->getSystemValueInt('preview_max_y', 4096);
-
-		return $this->generateProviderPreview($file, $maxWidth, $maxHeight, false, true, $mimeType, $version);
-	}
-
-	private function generateProviderPreview(File $file, int $width, int $height, bool $crop, bool $max, string $mimeType, ?string $version): Preview {
-		$previewProviders = $this->previewManager->getProviders();
-		foreach ($previewProviders as $supportedMimeType => $providers) {
-			// Filter out providers that does not support this mime
-			if (!preg_match($supportedMimeType, $mimeType)) {
-				continue;
-			}
-
-			foreach ($providers as $providerClosure) {
-
-				$provider = $this->helper->getProvider($providerClosure);
-				if (!($provider instanceof IProviderV2)) {
-					continue;
-				}
-
-				if (!$provider->isAvailable($file)) {
-					continue;
-				}
-
-				$previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
-				$sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
-				try {
-					$this->logger->debug('Calling preview provider for {mimeType} with width={width}, height={height}', [
-						'mimeType' => $mimeType,
-						'width' => $width,
-						'height' => $height,
-					]);
-					$preview = $this->helper->getThumbnail($provider, $file, $width, $height);
-				} finally {
-					self::unguardWithSemaphore($sem);
-				}
-
-				if (!($preview instanceof IImage)) {
-					continue;
-				}
-
-				try {
-					$previewEntry = new Preview();
-					$previewEntry->setFileId($file->getId());
-					$previewEntry->setStorageId($file->getMountPoint()->getNumericStorageId());
-					$previewEntry->setSourceMimeType($file->getMimeType());
-					$previewEntry->setWidth($preview->width());
-					$previewEntry->setHeight($preview->height());
-					$previewEntry->setVersion($version);
-					$previewEntry->setMax($max);
-					$previewEntry->setCropped($crop);
-					$previewEntry->setEncrypted(false);
-					$previewEntry->setMimetype($preview->dataMimeType());
-					$previewEntry->setEtag($file->getEtag());
-					$previewEntry->setMtime((new \DateTime())->getTimestamp());
-					$previewEntry->setSize(0);
-					return $this->savePreview($previewEntry, $preview);
-				} catch (NotPermittedException) {
-					throw new NotFoundException();
-				}
-			}
-		}
-
-		throw new NotFoundException('No provider successfully handled the preview generation');
-	}
-
-	/**
-	 * @psalm-param IPreview::MODE_* $mode
-	 * @return int[]
-	 */
-	private function calculateSize(int $width, int $height, bool $crop, string $mode, int $maxWidth, int $maxHeight): array {
-		/*
+    public const SEMAPHORE_ID_ALL = 0x0a11;
+    public const SEMAPHORE_ID_NEW = 0x07ea;
+
+    public function __construct(
+        private IConfig $config,
+        private IPreview $previewManager,
+        private GeneratorHelper $helper,
+        private IEventDispatcher $eventDispatcher,
+        private LoggerInterface $logger,
+        private PreviewMapper $previewMapper,
+        private StorageFactory $storageFactory,
+    ) {
+    }
+
+    /**
+     * Returns a preview of a file
+     *
+     * The cache is searched first and if nothing usable was found then a preview is
+     * generated by one of the providers
+     *
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     */
+    public function getPreview(
+        File $file,
+        int $width = -1,
+        int $height = -1,
+        bool $crop = false,
+        string $mode = IPreview::MODE_FILL,
+        ?string $mimeType = null,
+        bool $cacheResult = true,
+    ): ISimpleFile {
+        $specification = [
+            'width' => $width,
+            'height' => $height,
+            'crop' => $crop,
+            'mode' => $mode,
+        ];
+
+        $this->eventDispatcher->dispatchTyped(new BeforePreviewFetchedEvent(
+            $file,
+            $width,
+            $height,
+            $crop,
+            $mode,
+            $mimeType,
+        ));
+
+        $this->logger->debug('Requesting preview for {path} with width={width}, height={height}, crop={crop}, mode={mode}, mimeType={mimeType}', [
+            'path' => $file->getPath(),
+            'width' => $width,
+            'height' => $height,
+            'crop' => $crop,
+            'mode' => $mode,
+            'mimeType' => $mimeType,
+        ]);
+
+
+        // since we only ask for one preview, and the generate method return the last one it created, it returns the one we want
+        return $this->generatePreviews($file, [$specification], $mimeType, $cacheResult);
+    }
+
+    /**
+     * Generates previews of a file
+     *
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     */
+    public function generatePreviews(File $file, array $specifications, ?string $mimeType = null, bool $cacheResult = true): ISimpleFile {
+        //Make sure that we can read the file
+        if (!$file->isReadable()) {
+            $this->logger->warning('Cannot read file: {path}, skipping preview generation.', ['path' => $file->getPath()]);
+            throw new NotFoundException('Cannot read file');
+        }
+
+        if ($mimeType === null) {
+            $mimeType = $file->getMimeType();
+        }
+
+        [$file->getId() => $previews] = $this->previewMapper->getAvailablePreviews([$file->getId()]);
+
+        $previewVersion = null;
+        if ($file instanceof IVersionedPreviewFile) {
+            $previewVersion = $file->getPreviewVersion();
+        }
+
+        // Get the max preview and infer the max preview sizes from that
+        $maxPreview = $this->getMaxPreview($previews, $file, $mimeType, $previewVersion);
+        $maxPreviewImage = null; // only load the image when we need it
+        if ($maxPreview->getSize() === 0) {
+            $this->storageFactory->deletePreview($maxPreview);
+            $this->previewMapper->delete($maxPreview);
+            $this->logger->error('Max preview generated for file {path} has size 0, deleting and throwing exception.', ['path' => $file->getPath()]);
+            throw new NotFoundException('Max preview size 0, invalid!');
+        }
+
+        $maxWidth = $maxPreview->getWidth();
+        $maxHeight = $maxPreview->getHeight();
+
+        if ($maxWidth <= 0 || $maxHeight <= 0) {
+            throw new NotFoundException('The maximum preview sizes are zero or less pixels');
+        }
+
+        $previewFile = null;
+        foreach ($specifications as $specification) {
+            $width = $specification['width'] ?? -1;
+            $height = $specification['height'] ?? -1;
+            $crop = $specification['crop'] ?? false;
+            $mode = $specification['mode'] ?? IPreview::MODE_FILL;
+
+            // If both width and height are -1 we just want the max preview
+            if ($width === -1 && $height === -1) {
+                $width = $maxWidth;
+                $height = $maxHeight;
+            }
+
+            // Calculate the preview size
+            [$width, $height] = $this->calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight);
+
+            // No need to generate a preview that is just the max preview
+            if ($width === $maxWidth && $height === $maxHeight) {
+                // ensure correct return value if this was the last one
+                $previewFile = new PreviewFile($maxPreview, $this->storageFactory, $this->previewMapper);
+                continue;
+            }
+
+            // Try to get a cached preview. Else generate (and store) one
+            try {
+                $preview = array_find($previews, fn (Preview $preview): bool => $preview->getWidth() === $width
+                    && $preview->getHeight() === $height && $preview->getMimetype() === $maxPreview->getMimetype()
+                    && $preview->getVersion() === $previewVersion && $preview->isCropped() === $crop);
+
+                if ($preview) {
+                    $previewFile = new PreviewFile($preview, $this->storageFactory, $this->previewMapper);
+                } else {
+                    if (!$this->previewManager->isMimeSupported($mimeType)) {
+                        throw new NotFoundException();
+                    }
+
+                    if ($maxPreviewImage === null) {
+                        $maxPreviewImage = $this->helper->getImage(new PreviewFile($maxPreview, $this->storageFactory, $this->previewMapper));
+                    }
+
+                    $this->logger->debug('Cached preview not found for file {path}, generating a new preview.', ['path' => $file->getPath()]);
+                    $previewFile = $this->generatePreview($file, $maxPreviewImage, $width, $height, $crop, $maxWidth, $maxHeight, $previewVersion, $cacheResult);
+                }
+            } catch (\InvalidArgumentException $e) {
+                throw new NotFoundException('', 0, $e);
+            }
+
+            if ($previewFile->getSize() === 0) {
+                $previewFile->delete();
+                throw new NotFoundException('Cached preview size 0, invalid!');
+            }
+        }
+        assert($previewFile !== null);
+
+        // Free memory being used by the embedded image resource.  Without this the image is kept in memory indefinitely.
+        // Garbage Collection does NOT free this memory.  We have to do it ourselves.
+        if ($maxPreviewImage instanceof \OCP\Image) {
+            $maxPreviewImage->destroy();
+        }
+
+        return $previewFile;
+    }
+
+    /**
+     * Acquire a semaphore of the specified id and concurrency, blocking if necessary.
+     * Return an identifier of the semaphore on success, which can be used to release it via
+     * {@see Generator::unguardWithSemaphore()}.
+     *
+     * @param int $semId
+     * @param int $concurrency
+     * @return false|\SysvSemaphore the semaphore on success or false on failure
+     */
+    public static function guardWithSemaphore(int $semId, int $concurrency) {
+        if (!extension_loaded('sysvsem')) {
+            return false;
+        }
+        $sem = sem_get($semId, $concurrency);
+        if ($sem === false) {
+            return false;
+        }
+        if (!sem_acquire($sem)) {
+            return false;
+        }
+        return $sem;
+    }
+
+    /**
+     * Releases the semaphore acquired from {@see Generator::guardWithSemaphore()}.
+     *
+     * @param false|\SysvSemaphore $semId the semaphore identifier returned by guardWithSemaphore
+     * @return bool
+     */
+    public static function unguardWithSemaphore(false|\SysvSemaphore $semId): bool {
+        if ($semId === false || !($semId instanceof \SysvSemaphore)) {
+            return false;
+        }
+        return sem_release($semId);
+    }
+
+    /**
+     * Get the number of concurrent threads supported by the host.
+     *
+     * @return int number of concurrent threads, or 0 if it cannot be determined
+     */
+    public static function getHardwareConcurrency(): int {
+        static $width;
+
+        if (!isset($width)) {
+            if (function_exists('ini_get')) {
+                $openBasedir = ini_get('open_basedir');
+                if (empty($openBasedir) || strpos($openBasedir, '/proc/cpuinfo') !== false) {
+                    $width = is_readable('/proc/cpuinfo') ? substr_count(file_get_contents('/proc/cpuinfo'), 'processor') : 0;
+                } else {
+                    $width = 0;
+                }
+            } else {
+                $width = 0;
+            }
+        }
+        return $width;
+    }
+
+    /**
+     * Get number of concurrent preview generations from system config
+     *
+     * Two config entries, `preview_concurrency_new` and `preview_concurrency_all`,
+     * are available. If not set, the default values are determined with the hardware concurrency
+     * of the host. In case the hardware concurrency cannot be determined, or the user sets an
+     * invalid value, fallback values are:
+     * For new images whose previews do not exist and need to be generated, 4;
+     * For all preview generation requests, 8.
+     * Value of `preview_concurrency_all` should be greater than or equal to that of
+     * `preview_concurrency_new`, otherwise, the latter is returned.
+     *
+     * @param string $type either `preview_concurrency_new` or `preview_concurrency_all`
+     * @return int number of concurrent preview generations, or -1 if $type is invalid
+     */
+    public function getNumConcurrentPreviews(string $type): int {
+        static $cached = [];
+        if (array_key_exists($type, $cached)) {
+            return $cached[$type];
+        }
+
+        $hardwareConcurrency = self::getHardwareConcurrency();
+        switch ($type) {
+            case 'preview_concurrency_all':
+                $fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency * 2 : 8;
+                $concurrency_all = $this->config->getSystemValueInt($type, $fallback);
+                $concurrency_new = $this->getNumConcurrentPreviews('preview_concurrency_new');
+                $cached[$type] = max($concurrency_all, $concurrency_new);
+                break;
+            case 'preview_concurrency_new':
+                $fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency : 4;
+                $cached[$type] = $this->config->getSystemValueInt($type, $fallback);
+                break;
+            default:
+                return -1;
+        }
+        return $cached[$type];
+    }
+
+    /**
+     * @param Preview[] $previews
+     * @throws NotFoundException
+     */
+    private function getMaxPreview(array $previews, File $file, string $mimeType, ?string $version): Preview {
+        // We don't know the max preview size, so we can't use getCachedPreview.
+        // It might have been generated with a higher resolution than the current value.
+        foreach ($previews as $preview) {
+            if ($preview->isMax() && ($version === $preview->getVersion())) {
+                return $preview;
+            }
+        }
+
+        $maxWidth = $this->config->getSystemValueInt('preview_max_x', 4096);
+        $maxHeight = $this->config->getSystemValueInt('preview_max_y', 4096);
+
+        return $this->generateProviderPreview($file, $maxWidth, $maxHeight, false, true, $mimeType, $version);
+    }
+
+    private function generateProviderPreview(File $file, int $width, int $height, bool $crop, bool $max, string $mimeType, ?string $version): Preview {
+        $previewProviders = $this->previewManager->getProviders();
+        foreach ($previewProviders as $supportedMimeType => $providers) {
+            // Filter out providers that does not support this mime
+            if (!preg_match($supportedMimeType, $mimeType)) {
+                continue;
+            }
+
+            foreach ($providers as $providerClosure) {
+
+                $provider = $this->helper->getProvider($providerClosure);
+                if (!($provider instanceof IProviderV2)) {
+                    continue;
+                }
+
+                if (!$provider->isAvailable($file)) {
+                    continue;
+                }
+
+                $previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
+                $sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
+                try {
+                    $this->logger->debug('Calling preview provider for {mimeType} with width={width}, height={height}', [
+                        'mimeType' => $mimeType,
+                        'width' => $width,
+                        'height' => $height,
+                    ]);
+                    $preview = $this->helper->getThumbnail($provider, $file, $width, $height);
+                } finally {
+                    self::unguardWithSemaphore($sem);
+                }
+
+                if (!($preview instanceof IImage)) {
+                    continue;
+                }
+
+                try {
+                    $previewEntry = new Preview();
+                    $previewEntry->setFileId($file->getId());
+                    $previewEntry->setStorageId($file->getMountPoint()->getNumericStorageId());
+                    $previewEntry->setSourceMimeType($file->getMimeType());
+                    $previewEntry->setWidth($preview->width());
+                    $previewEntry->setHeight($preview->height());
+                    $previewEntry->setVersion($version);
+                    $previewEntry->setMax($max);
+                    $previewEntry->setCropped($crop);
+                    $previewEntry->setEncrypted(false);
+                    $previewEntry->setMimetype($preview->dataMimeType());
+                    $previewEntry->setEtag($file->getEtag());
+                    $previewEntry->setMtime((new \DateTime())->getTimestamp());
+                    $previewEntry->setSize(0);
+                    return $this->savePreview($previewEntry, $preview);
+                } catch (NotPermittedException) {
+                    throw new NotFoundException();
+                }
+            }
+        }
+
+        throw new NotFoundException('No provider successfully handled the preview generation');
+    }
+
+    /**
+     * @psalm-param IPreview::MODE_* $mode
+     * @return int[]
+     */
+    private function calculateSize(int $width, int $height, bool $crop, string $mode, int $maxWidth, int $maxHeight): array {
+        /*
 		 * If we are not cropping we have to make sure the requested image
 		 * respects the aspect ratio of the original.
 		 */
-		if (!$crop) {
-			$ratio = $maxHeight / $maxWidth;
+        if (!$crop) {
+            $ratio = $maxHeight / $maxWidth;
 
-			if ($width === -1) {
-				$width = $height / $ratio;
-			}
-			if ($height === -1) {
-				$height = $width * $ratio;
-			}
+            if ($width === -1) {
+                $width = $height / $ratio;
+            }
+            if ($height === -1) {
+                $height = $width * $ratio;
+            }
 
-			$ratioH = $height / $maxHeight;
-			$ratioW = $width / $maxWidth;
+            $ratioH = $height / $maxHeight;
+            $ratioW = $width / $maxWidth;
 
-			/*
+            /*
 			 * Fill means that the $height and $width are the max
 			 * Cover means min.
 			 */
-			if ($mode === IPreview::MODE_FILL) {
-				if ($ratioH > $ratioW) {
-					$height = $width * $ratio;
-				} else {
-					$width = $height / $ratio;
-				}
-			} elseif ($mode === IPreview::MODE_COVER) {
-				if ($ratioH > $ratioW) {
-					$width = $height / $ratio;
-				} else {
-					$height = $width * $ratio;
-				}
-			}
-		}
-
-		if ($height !== $maxHeight && $width !== $maxWidth) {
-			/*
+            if ($mode === IPreview::MODE_FILL) {
+                if ($ratioH > $ratioW) {
+                    $height = $width * $ratio;
+                } else {
+                    $width = $height / $ratio;
+                }
+            } elseif ($mode === IPreview::MODE_COVER) {
+                if ($ratioH > $ratioW) {
+                    $width = $height / $ratio;
+                } else {
+                    $height = $width * $ratio;
+                }
+            }
+        }
+
+        if ($height !== $maxHeight && $width !== $maxWidth) {
+            /*
 			 * Scale to the nearest power of four
 			 */
-			$pow4height = 4 ** ceil(log($height) / log(4));
-			$pow4width = 4 ** ceil(log($width) / log(4));
-
-			// Minimum size is 64
-			$pow4height = max($pow4height, 64);
-			$pow4width = max($pow4width, 64);
-
-			$ratioH = $height / $pow4height;
-			$ratioW = $width / $pow4width;
-
-			if ($ratioH < $ratioW) {
-				$width = $pow4width;
-				$height /= $ratioW;
-			} else {
-				$height = $pow4height;
-				$width /= $ratioH;
-			}
-		}
-
-		/*
+            $pow4height = 4 ** ceil(log($height) / log(4));
+            $pow4width = 4 ** ceil(log($width) / log(4));
+
+            // Minimum size is 64
+            $pow4height = max($pow4height, 64);
+            $pow4width = max($pow4width, 64);
+
+            $ratioH = $height / $pow4height;
+            $ratioW = $width / $pow4width;
+
+            if ($ratioH < $ratioW) {
+                $width = $pow4width;
+                $height /= $ratioW;
+            } else {
+                $height = $pow4height;
+                $width /= $ratioH;
+            }
+        }
+
+        /*
 		 * Make sure the requested height and width fall within the max
 		 * of the preview.
 		 */
-		if ($height > $maxHeight) {
-			$ratio = $height / $maxHeight;
-			$height = $maxHeight;
-			$width /= $ratio;
-		}
-		if ($width > $maxWidth) {
-			$ratio = $width / $maxWidth;
-			$width = $maxWidth;
-			$height /= $ratio;
-		}
-
-		return [(int)round($width), (int)round($height)];
-	}
-
-	/**
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 */
-	private function generatePreview(
-		File $file,
-		IImage $maxPreview,
-		int $width,
-		int $height,
-		bool $crop,
-		int $maxWidth,
-		int $maxHeight,
-		?string $version,
-		bool $cacheResult,
-	): ISimpleFile {
-		$preview = $maxPreview;
-		if (!$preview->valid()) {
-			throw new \InvalidArgumentException('Failed to generate preview, failed to load image');
-		}
-
-		$previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
-		$sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
-		try {
-			if ($crop) {
-				if ($height !== $preview->height() && $width !== $preview->width()) {
-					//Resize
-					$widthR = $preview->width() / $width;
-					$heightR = $preview->height() / $height;
-
-					if ($widthR > $heightR) {
-						$scaleH = $height;
-						$scaleW = $maxWidth / $heightR;
-					} else {
-						$scaleH = $maxHeight / $widthR;
-						$scaleW = $width;
-					}
-					$preview = $preview->preciseResizeCopy((int)round($scaleW), (int)round($scaleH));
-				}
-				$cropX = (int)floor(abs($width - $preview->width()) * 0.5);
-				$cropY = (int)floor(abs($height - $preview->height()) * 0.5);
-				$preview = $preview->cropCopy($cropX, $cropY, $width, $height);
-			} else {
-				$preview = $maxPreview->resizeCopy(max($width, $height));
-			}
-		} finally {
-			self::unguardWithSemaphore($sem);
-		}
-
-		$previewEntry = new Preview();
-		$previewEntry->setFileId($file->getId());
-		$previewEntry->setStorageId($file->getMountPoint()->getNumericStorageId());
-		$previewEntry->setWidth($width);
-		$previewEntry->setSourceMimeType($file->getMimeType());
-		$previewEntry->setHeight($height);
-		$previewEntry->setVersion($version);
-		$previewEntry->setMax(false);
-		$previewEntry->setCropped($crop);
-		$previewEntry->setEncrypted(false);
-		$previewEntry->setMimeType($preview->dataMimeType());
-		$previewEntry->setEtag($file->getEtag());
-		$previewEntry->setMtime((new \DateTime())->getTimestamp());
-		$previewEntry->setSize(0);
-		if ($cacheResult) {
-			$previewEntry = $this->savePreview($previewEntry, $preview);
-			return new PreviewFile($previewEntry, $this->storageFactory, $this->previewMapper);
-		} else {
-			return new InMemoryFile($previewEntry->getName(), $preview->data());
-		}
-	}
-
-	/**
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 * @throws NotPermittedException
-	 * @throws \OCP\DB\Exception
-	 */
-	public function savePreview(Preview $previewEntry, IImage $preview): Preview {
-		$previewEntry = $this->previewMapper->insert($previewEntry);
-
-		// we need to save to DB first
-		try {
-			if ($preview instanceof IStreamImage) {
-				$size = $this->storageFactory->writePreview($previewEntry, $preview->resource());
-			} else {
-				$stream = fopen('php://temp', 'w+');
-				fwrite($stream, $preview->data());
-				rewind($stream);
-				$size = $this->storageFactory->writePreview($previewEntry, $stream);
-			}
-			if (!$size) {
-				throw new \RuntimeException('Unable to write preview file');
-			}
-		} catch (\Exception $e) {
-			$this->previewMapper->delete($previewEntry);
-			throw $e;
-		}
-		$previewEntry->setSize($size);
-		return $this->previewMapper->update($previewEntry);
-	}
+        if ($height > $maxHeight) {
+            $ratio = $height / $maxHeight;
+            $height = $maxHeight;
+            $width /= $ratio;
+        }
+        if ($width > $maxWidth) {
+            $ratio = $width / $maxWidth;
+            $width = $maxWidth;
+            $height /= $ratio;
+        }
+
+        return [(int)round($width), (int)round($height)];
+    }
+
+    /**
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     */
+    private function generatePreview(
+        File $file,
+        IImage $maxPreview,
+        int $width,
+        int $height,
+        bool $crop,
+        int $maxWidth,
+        int $maxHeight,
+        ?string $version,
+        bool $cacheResult,
+    ): ISimpleFile {
+        $preview = $maxPreview;
+        if (!$preview->valid()) {
+            throw new \InvalidArgumentException('Failed to generate preview, failed to load image');
+        }
+
+        $previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
+        $sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
+        try {
+            if ($crop) {
+                if ($height !== $preview->height() && $width !== $preview->width()) {
+                    //Resize
+                    $widthR = $preview->width() / $width;
+                    $heightR = $preview->height() / $height;
+
+                    if ($widthR > $heightR) {
+                        $scaleH = $height;
+                        $scaleW = $maxWidth / $heightR;
+                    } else {
+                        $scaleH = $maxHeight / $widthR;
+                        $scaleW = $width;
+                    }
+                    $preview = $preview->preciseResizeCopy((int)round($scaleW), (int)round($scaleH));
+                }
+                $cropX = (int)floor(abs($width - $preview->width()) * 0.5);
+                $cropY = (int)floor(abs($height - $preview->height()) * 0.5);
+                $preview = $preview->cropCopy($cropX, $cropY, $width, $height);
+            } else {
+                $preview = $maxPreview->resizeCopy(max($width, $height));
+            }
+        } finally {
+            self::unguardWithSemaphore($sem);
+        }
+
+        $previewEntry = new Preview();
+        $previewEntry->setFileId($file->getId());
+        $previewEntry->setStorageId($file->getMountPoint()->getNumericStorageId());
+        $previewEntry->setWidth($width);
+        $previewEntry->setSourceMimeType($file->getMimeType());
+        $previewEntry->setHeight($height);
+        $previewEntry->setVersion($version);
+        $previewEntry->setMax(false);
+        $previewEntry->setCropped($crop);
+        $previewEntry->setEncrypted(false);
+        $previewEntry->setMimeType($preview->dataMimeType());
+        $previewEntry->setEtag($file->getEtag());
+        $previewEntry->setMtime((new \DateTime())->getTimestamp());
+        $previewEntry->setSize(0);
+        if ($cacheResult) {
+            $previewEntry = $this->savePreview($previewEntry, $preview);
+            return new PreviewFile($previewEntry, $this->storageFactory, $this->previewMapper);
+        } else {
+            return new InMemoryFile($previewEntry->getName(), $preview->data());
+        }
+    }
+
+    /**
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     * @throws NotPermittedException
+     * @throws \OCP\DB\Exception
+     */
+    public function savePreview(Preview $previewEntry, IImage $preview): Preview {
+        $previewEntry = $this->previewMapper->insert($previewEntry);
+
+        // we need to save to DB first
+        try {
+            if ($preview instanceof IStreamImage) {
+                $size = $this->storageFactory->writePreview($previewEntry, $preview->resource());
+            } else {
+                $stream = fopen('php://temp', 'w+');
+                fwrite($stream, $preview->data());
+                rewind($stream);
+                $size = $this->storageFactory->writePreview($previewEntry, $stream);
+            }
+            if (!$size) {
+                throw new \RuntimeException('Unable to write preview file');
+            }
+        } catch (\Exception $e) {
+            $this->previewMapper->delete($previewEntry);
+            throw $e;
+        }
+        $previewEntry->setSize($size);
+        return $this->previewMapper->update($previewEntry);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -223,7 +223,7 @@ 
 	 * @param false|\SysvSemaphore $semId the semaphore identifier returned by guardWithSemaphore
 	 * @return bool
 	 */
-	public static function unguardWithSemaphore(false|\SysvSemaphore $semId): bool {
+	public static function unguardWithSemaphore(false | \SysvSemaphore $semId): bool {
 		if ($semId === false || !($semId instanceof \SysvSemaphore)) {
 			return false;
 		}
@@ -451,7 +451,7 @@ 
 			$height /= $ratio;
 		}
 
-		return [(int)round($width), (int)round($height)];
+		return [(int) round($width), (int) round($height)];
 	}
 
 	/**
@@ -490,10 +490,10 @@ 
 						$scaleH = $maxHeight / $widthR;
 						$scaleW = $width;
 					}
-					$preview = $preview->preciseResizeCopy((int)round($scaleW), (int)round($scaleH));
+					$preview = $preview->preciseResizeCopy((int) round($scaleW), (int) round($scaleH));
 				}
-				$cropX = (int)floor(abs($width - $preview->width()) * 0.5);
-				$cropY = (int)floor(abs($height - $preview->height()) * 0.5);
+				$cropX = (int) floor(abs($width - $preview->width()) * 0.5);
+				$cropY = (int) floor(abs($height - $preview->height()) * 0.5);
 				$preview = $preview->cropCopy($cropX, $cropY, $width, $height);
 			} else {
 				$preview = $maxPreview->resizeCopy(max($width, $height));

lib/private/Preview/Storage/LocalPreviewStorage.php

Indentation +210 added lines, -210 removed lines

@@ -28,214 +28,214 @@
 use RecursiveIteratorIterator;
 
 class LocalPreviewStorage implements IPreviewStorage {
-	private readonly string $rootFolder;
-	private readonly string $instanceId;
-
-	public function __construct(
-		private readonly IConfig $config,
-		private readonly PreviewMapper $previewMapper,
-		private readonly IAppConfig $appConfig,
-		private readonly IDBConnection $connection,
-		private readonly IMimeTypeDetector $mimeTypeDetector,
-		private readonly LoggerInterface $logger,
-	) {
-		$this->instanceId = $this->config->getSystemValueString('instanceid');
-		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
-	}
-
-	#[Override]
-	public function writePreview(Preview $preview, mixed $stream): int {
-		$previewPath = $this->constructPath($preview);
-		$this->createParentFiles($previewPath);
-		return file_put_contents($previewPath, $stream);
-	}
-
-	#[Override]
-	public function readPreview(Preview $preview): mixed {
-		$previewPath = $this->constructPath($preview);
-		$resource = @fopen($previewPath, 'r');
-		if ($resource === false) {
-			throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
-		}
-		return $resource;
-	}
-
-	#[Override]
-	public function deletePreview(Preview $preview): void {
-		$previewPath = $this->constructPath($preview);
-		if (!@unlink($previewPath) && is_file($previewPath)) {
-			throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
-		}
-	}
-
-	public function getPreviewRootFolder(): string {
-		return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
-	}
-
-	private function constructPath(Preview $preview): string {
-		return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
-	}
-
-	private function createParentFiles(string $path): void {
-		$dirname = dirname($path);
-		@mkdir($dirname, recursive: true);
-		if (!is_dir($dirname)) {
-			throw new NotPermittedException("Unable to create directory '$dirname'");
-		}
-	}
-
-	#[Override]
-	public function migratePreview(Preview $preview, SimpleFile $file): void {
-		// legacy flat directory
-		$sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
-		if (!file_exists($sourcePath)) {
-			return;
-		}
-
-		$destinationPath = $this->constructPath($preview);
-		if (file_exists($destinationPath)) {
-			@unlink($sourcePath); // We already have a new preview, just delete the old one
-			return;
-		}
-
-		$this->createParentFiles($destinationPath);
-		$ok = rename($sourcePath, $destinationPath);
-		if (!$ok) {
-			throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
-		}
-	}
-
-	#[Override]
-	public function scan(): int {
-		$checkForFileCache = !$this->appConfig->getValueBool('core', 'previewMovedDone');
-
-		$scanner = new RecursiveDirectoryIterator($this->getPreviewRootFolder());
-		$previewsFound = 0;
-		foreach (new RecursiveIteratorIterator($scanner) as $file) {
-			if ($file->isFile()) {
-				$preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
-				if ($preview === false) {
-					$this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
-					continue;
-				}
-				try {
-					$preview->setSize($file->getSize());
-					$preview->setMtime($file->getMtime());
-					$preview->setEncrypted(false);
-
-					$qb = $this->connection->getQueryBuilder();
-					$result = $qb->select('storage', 'etag', 'mimetype')
-						->from('filecache')
-						->where($qb->expr()->eq('fileid', $qb->createNamedParameter($preview->getFileId())))
-						->setMaxResults(1)
-						->runAcrossAllShards() // Unavoidable because we can't extract the storage_id from the preview name
-						->executeQuery()
-						->fetchAll();
-
-					if (empty($result)) {
-						// original file is deleted
-						@unlink($file->getRealPath());
-						continue;
-					}
-
-					if ($checkForFileCache) {
-						$relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
-						$rowAffected = $qb->delete('filecache')
-							->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
-							->executeStatement();
-						if ($rowAffected > 0) {
-							$this->deleteParentsFromFileCache(dirname($relativePath));
-						}
-					}
-
-					$preview->setStorageId($result[0]['storage']);
-					$preview->setEtag($result[0]['etag']);
-					$preview->setSourceMimetype($result[0]['mimetype']);
-
-					// try to insert, if that fails the preview is already in the DB
-					$this->previewMapper->insert($preview);
-
-					// Move old flat preview to new format
-					$dirName = str_replace($this->getPreviewRootFolder(), '', $file->getPath());
-					if (preg_match('/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9]+/', $dirName) !== 1) {
-						$previewPath = $this->constructPath($preview);
-						$this->createParentFiles($previewPath);
-						$ok = rename($file->getRealPath(), $previewPath);
-						if (!$ok) {
-							throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
-						}
-					}
-				} catch (Exception $e) {
-					if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-						throw $e;
-					}
-				}
-				$previewsFound++;
-			}
-		}
-
-		return $previewsFound;
-	}
-
-	private function deleteParentsFromFileCache(string $dirname): void {
-		$qb = $this->connection->getQueryBuilder();
-
-		$result = $qb->select('fileid', 'path', 'storage', 'parent')
-			->from('filecache')
-			->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($dirname))))
-			->setMaxResults(1)
-			->runAcrossAllShards()
-			->executeQuery()
-			->fetchAll();
-
-		if (empty($result)) {
-			return;
-		}
-
-		$this->connection->beginTransaction();
-
-		$parentId = $result[0]['parent'];
-		$fileId = $result[0]['fileid'];
-		$storage = $result[0]['storage'];
-
-		try {
-			while (true) {
-				$qb = $this->connection->getQueryBuilder();
-				$childs = $qb->select('fileid', 'path', 'storage')
-					->from('filecache')
-					->where($qb->expr()->eq('parent', $qb->createNamedParameter($fileId)))
-					->hintShardKey('storage', $storage)
-					->executeQuery()
-					->fetchAll();
-
-				if (!empty($childs)) {
-					break;
-				}
-
-				$qb = $this->connection->getQueryBuilder();
-				$qb->delete('filecache')
-					->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
-					->hintShardKey('storage', $result[0]['storage'])
-					->executeStatement();
-
-				$qb = $this->connection->getQueryBuilder();
-				$result = $qb->select('fileid', 'path', 'storage', 'parent')
-					->from('filecache')
-					->where($qb->expr()->eq('fileid', $qb->createNamedParameter($parentId)))
-					->setMaxResults(1)
-					->hintShardKey('storage', $storage)
-					->executeQuery()
-					->fetchAll();
-
-				if (empty($result)) {
-					break;
-				}
-
-				$fileId = $parentId;
-				$parentId = $result[0]['parent'];
-			}
-		} finally {
-			$this->connection->commit();
-		}
-	}
+    private readonly string $rootFolder;
+    private readonly string $instanceId;
+
+    public function __construct(
+        private readonly IConfig $config,
+        private readonly PreviewMapper $previewMapper,
+        private readonly IAppConfig $appConfig,
+        private readonly IDBConnection $connection,
+        private readonly IMimeTypeDetector $mimeTypeDetector,
+        private readonly LoggerInterface $logger,
+    ) {
+        $this->instanceId = $this->config->getSystemValueString('instanceid');
+        $this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+    }
+
+    #[Override]
+    public function writePreview(Preview $preview, mixed $stream): int {
+        $previewPath = $this->constructPath($preview);
+        $this->createParentFiles($previewPath);
+        return file_put_contents($previewPath, $stream);
+    }
+
+    #[Override]
+    public function readPreview(Preview $preview): mixed {
+        $previewPath = $this->constructPath($preview);
+        $resource = @fopen($previewPath, 'r');
+        if ($resource === false) {
+            throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
+        }
+        return $resource;
+    }
+
+    #[Override]
+    public function deletePreview(Preview $preview): void {
+        $previewPath = $this->constructPath($preview);
+        if (!@unlink($previewPath) && is_file($previewPath)) {
+            throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
+        }
+    }
+
+    public function getPreviewRootFolder(): string {
+        return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
+    }
+
+    private function constructPath(Preview $preview): string {
+        return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
+    }
+
+    private function createParentFiles(string $path): void {
+        $dirname = dirname($path);
+        @mkdir($dirname, recursive: true);
+        if (!is_dir($dirname)) {
+            throw new NotPermittedException("Unable to create directory '$dirname'");
+        }
+    }
+
+    #[Override]
+    public function migratePreview(Preview $preview, SimpleFile $file): void {
+        // legacy flat directory
+        $sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
+        if (!file_exists($sourcePath)) {
+            return;
+        }
+
+        $destinationPath = $this->constructPath($preview);
+        if (file_exists($destinationPath)) {
+            @unlink($sourcePath); // We already have a new preview, just delete the old one
+            return;
+        }
+
+        $this->createParentFiles($destinationPath);
+        $ok = rename($sourcePath, $destinationPath);
+        if (!$ok) {
+            throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
+        }
+    }
+
+    #[Override]
+    public function scan(): int {
+        $checkForFileCache = !$this->appConfig->getValueBool('core', 'previewMovedDone');
+
+        $scanner = new RecursiveDirectoryIterator($this->getPreviewRootFolder());
+        $previewsFound = 0;
+        foreach (new RecursiveIteratorIterator($scanner) as $file) {
+            if ($file->isFile()) {
+                $preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
+                if ($preview === false) {
+                    $this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
+                    continue;
+                }
+                try {
+                    $preview->setSize($file->getSize());
+                    $preview->setMtime($file->getMtime());
+                    $preview->setEncrypted(false);
+
+                    $qb = $this->connection->getQueryBuilder();
+                    $result = $qb->select('storage', 'etag', 'mimetype')
+                        ->from('filecache')
+                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($preview->getFileId())))
+                        ->setMaxResults(1)
+                        ->runAcrossAllShards() // Unavoidable because we can't extract the storage_id from the preview name
+                        ->executeQuery()
+                        ->fetchAll();
+
+                    if (empty($result)) {
+                        // original file is deleted
+                        @unlink($file->getRealPath());
+                        continue;
+                    }
+
+                    if ($checkForFileCache) {
+                        $relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
+                        $rowAffected = $qb->delete('filecache')
+                            ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
+                            ->executeStatement();
+                        if ($rowAffected > 0) {
+                            $this->deleteParentsFromFileCache(dirname($relativePath));
+                        }
+                    }
+
+                    $preview->setStorageId($result[0]['storage']);
+                    $preview->setEtag($result[0]['etag']);
+                    $preview->setSourceMimetype($result[0]['mimetype']);
+
+                    // try to insert, if that fails the preview is already in the DB
+                    $this->previewMapper->insert($preview);
+
+                    // Move old flat preview to new format
+                    $dirName = str_replace($this->getPreviewRootFolder(), '', $file->getPath());
+                    if (preg_match('/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9]+/', $dirName) !== 1) {
+                        $previewPath = $this->constructPath($preview);
+                        $this->createParentFiles($previewPath);
+                        $ok = rename($file->getRealPath(), $previewPath);
+                        if (!$ok) {
+                            throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
+                        }
+                    }
+                } catch (Exception $e) {
+                    if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                        throw $e;
+                    }
+                }
+                $previewsFound++;
+            }
+        }
+
+        return $previewsFound;
+    }
+
+    private function deleteParentsFromFileCache(string $dirname): void {
+        $qb = $this->connection->getQueryBuilder();
+
+        $result = $qb->select('fileid', 'path', 'storage', 'parent')
+            ->from('filecache')
+            ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($dirname))))
+            ->setMaxResults(1)
+            ->runAcrossAllShards()
+            ->executeQuery()
+            ->fetchAll();
+
+        if (empty($result)) {
+            return;
+        }
+
+        $this->connection->beginTransaction();
+
+        $parentId = $result[0]['parent'];
+        $fileId = $result[0]['fileid'];
+        $storage = $result[0]['storage'];
+
+        try {
+            while (true) {
+                $qb = $this->connection->getQueryBuilder();
+                $childs = $qb->select('fileid', 'path', 'storage')
+                    ->from('filecache')
+                    ->where($qb->expr()->eq('parent', $qb->createNamedParameter($fileId)))
+                    ->hintShardKey('storage', $storage)
+                    ->executeQuery()
+                    ->fetchAll();
+
+                if (!empty($childs)) {
+                    break;
+                }
+
+                $qb = $this->connection->getQueryBuilder();
+                $qb->delete('filecache')
+                    ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
+                    ->hintShardKey('storage', $result[0]['storage'])
+                    ->executeStatement();
+
+                $qb = $this->connection->getQueryBuilder();
+                $result = $qb->select('fileid', 'path', 'storage', 'parent')
+                    ->from('filecache')
+                    ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($parentId)))
+                    ->setMaxResults(1)
+                    ->hintShardKey('storage', $storage)
+                    ->executeQuery()
+                    ->fetchAll();
+
+                if (empty($result)) {
+                    break;
+                }
+
+                $fileId = $parentId;
+                $parentId = $result[0]['parent'];
+            }
+        } finally {
+            $this->connection->commit();
+        }
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -40,7 +40,7 @@ 
 		private readonly LoggerInterface $logger,
 	) {
 		$this->instanceId = $this->config->getSystemValueString('instanceid');
-		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data');
 	}
 
 	#[Override]
@@ -55,7 +55,7 @@ 
 		$previewPath = $this->constructPath($preview);
 		$resource = @fopen($previewPath, 'r');
 		if ($resource === false) {
-			throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
+			throw new NotFoundException('Unable to open preview stream at '.$previewPath);
 		}
 		return $resource;
 	}
@@ -64,16 +64,16 @@ 
 	public function deletePreview(Preview $preview): void {
 		$previewPath = $this->constructPath($preview);
 		if (!@unlink($previewPath) && is_file($previewPath)) {
-			throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
+			throw new NotPermittedException('Unable to delete preview at '.$previewPath);
 		}
 	}
 
 	public function getPreviewRootFolder(): string {
-		return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
+		return $this->rootFolder.'/appdata_'.$this->instanceId.'/preview/';
 	}
 
 	private function constructPath(Preview $preview): string {
-		return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
+		return $this->getPreviewRootFolder().implode('/', str_split(substr(md5((string) $preview->getFileId()), 0, 7))).'/'.$preview->getFileId().'/'.$preview->getName();
 	}
 
 	private function createParentFiles(string $path): void {
@@ -87,7 +87,7 @@ 
 	#[Override]
 	public function migratePreview(Preview $preview, SimpleFile $file): void {
 		// legacy flat directory
-		$sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
+		$sourcePath = $this->getPreviewRootFolder().$preview->getFileId().'/'.$preview->getName();
 		if (!file_exists($sourcePath)) {
 			return;
 		}
@@ -101,7 +101,7 @@ 
 		$this->createParentFiles($destinationPath);
 		$ok = rename($sourcePath, $destinationPath);
 		if (!$ok) {
-			throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
+			throw new LogicException('Failed to move '.$sourcePath.' to '.$destinationPath);
 		}
 	}
 
@@ -113,9 +113,9 @@ 
 		$previewsFound = 0;
 		foreach (new RecursiveIteratorIterator($scanner) as $file) {
 			if ($file->isFile()) {
-				$preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
+				$preview = Preview::fromPath((string) $file, $this->mimeTypeDetector);
 				if ($preview === false) {
-					$this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
+					$this->logger->error('Unable to parse preview information for '.$file->getRealPath());
 					continue;
 				}
 				try {
@@ -139,7 +139,7 @@ 
 					}
 
 					if ($checkForFileCache) {
-						$relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
+						$relativePath = str_replace($this->rootFolder.'/', '', $file->getRealPath());
 						$rowAffected = $qb->delete('filecache')
 							->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
 							->executeStatement();
@@ -162,7 +162,7 @@ 
 						$this->createParentFiles($previewPath);
 						$ok = rename($file->getRealPath(), $previewPath);
 						if (!$ok) {
-							throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
+							throw new LogicException('Failed to move '.$file->getRealPath().' to '.$previewPath);
 						}
 					}
 				} catch (Exception $e) {

lib/private/Preview/Storage/PreviewFile.php

Indentation +62 added lines, -62 removed lines

@@ -16,66 +16,66 @@
 use Override;
 
 class PreviewFile implements ISimpleFile {
-	public function __construct(
-		private readonly Preview $preview,
-		private readonly IPreviewStorage $storage,
-		private readonly PreviewMapper $previewMapper,
-	) {
-	}
-
-	#[Override]
-	public function getName(): string {
-		return $this->preview->getName();
-	}
-
-	#[Override]
-	public function getSize(): int|float {
-		return $this->preview->getSize();
-	}
-
-	#[Override]
-	public function getETag(): string {
-		return $this->preview->getEtag();
-	}
-
-	#[Override]
-	public function getMTime(): int {
-		return $this->preview->getMtime();
-	}
-
-	#[Override]
-	public function getContent(): string {
-		$stream = $this->storage->readPreview($this->preview);
-		return stream_get_contents($stream);
-	}
-
-	#[Override]
-	public function putContent($data): void {
-	}
-
-	#[Override]
-	public function delete(): void {
-		$this->storage->deletePreview($this->preview);
-		$this->previewMapper->delete($this->preview);
-	}
-
-	#[Override]
-	public function getMimeType(): string {
-		return $this->preview->getMimetype();
-	}
-
-	#[Override]
-	public function getExtension(): string {
-		return $this->preview->getExtension();
-	}
-
-	#[Override]
-	public function read() {
-		return $this->storage->readPreview($this->preview);
-	}
-
-	#[Override]
-	public function write() {
-		return false;
-	}
+    public function __construct(
+        private readonly Preview $preview,
+        private readonly IPreviewStorage $storage,
+        private readonly PreviewMapper $previewMapper,
+    ) {
+    }
+
+    #[Override]
+    public function getName(): string {
+        return $this->preview->getName();
+    }
+
+    #[Override]
+    public function getSize(): int|float {
+        return $this->preview->getSize();
+    }
+
+    #[Override]
+    public function getETag(): string {
+        return $this->preview->getEtag();
+    }
+
+    #[Override]
+    public function getMTime(): int {
+        return $this->preview->getMtime();
+    }
+
+    #[Override]
+    public function getContent(): string {
+        $stream = $this->storage->readPreview($this->preview);
+        return stream_get_contents($stream);
+    }
+
+    #[Override]
+    public function putContent($data): void {
+    }
+
+    #[Override]
+    public function delete(): void {
+        $this->storage->deletePreview($this->preview);
+        $this->previewMapper->delete($this->preview);
+    }
+
+    #[Override]
+    public function getMimeType(): string {
+        return $this->preview->getMimetype();
+    }
+
+    #[Override]
+    public function getExtension(): string {
+        return $this->preview->getExtension();
+    }
+
+    #[Override]
+    public function read() {
+        return $this->storage->readPreview($this->preview);
+    }
+
+    #[Override]
+    public function write() {
+        return false;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	}
 
 	#[Override]
-	public function getSize(): int|float {
+	public function getSize(): int | float {
 		return $this->preview->getSize();
 	}