imaginary - allow to generate heif, pdf and svg thumbnails

Signed-off-by: Simon L <[email protected]>
nextcloud · Feb 7, 2023 · 4cb0c16 · 4cb0c16
1 parent 2ddd7f5
commit 4cb0c16
Showing 1 changed file with 45 additions and 18 deletions.
diff --git a/lib/private/Preview/Imaginary.php b/lib/private/Preview/Imaginary.php
@@ -57,7 +57,7 @@ public function getMimeType(): string {
 	}
 
 	public static function supportedMimeTypes(): string {
-		return '/image\/(bmp|x-bitmap|png|jpeg|gif|heic|svg|tiff|webp)/';
+		return '/(image\/(bmp|x-bitmap|png|jpeg|gif|heic|heif|svg\+xml|tiff|webp)|application\/(pdf|illustrator))/';
 	}
 
 	public function getCroppedThumbnail(File $file, int $maxX, int $maxY, bool $crop): ?IImage {
@@ -81,33 +81,60 @@ public function getCroppedThumbnail(File $file, int $maxX, int $maxY, bool $crop
 
 		$httpClient = $this->service->newClient();
 
+		$convert = false;
+
 		switch ($file->getMimeType()) {
 			case 'image/gif':
 			case 'image/png':
 				$mimeType = 'png';
 				break;
+			case 'image/svg+xml':
+			case 'application/pdf':
+			case 'application/illustrator':
+				$convert = true;
+				break;
 			default:
 				$mimeType = 'jpeg';
 		}
 
-		$quality = $this->config->getAppValue('preview', 'jpeg_quality', '80');
-
-		$operations = [
-			[
-				'operation' => 'autorotate',
-			],
-			[
-				'operation' => ($crop ? 'smartcrop' : 'fit'),
-				'params' => [
-					'width' => $maxX,
-					'height' => $maxY,
-					'stripmeta' => 'true',
-					'type' => $mimeType,
-					'norotation' => 'true',
-					'quality' => $quality,
+		if ($convert) {
+			$operations = [
+				[
+					'operation' => 'convert',
+					'params' => [
+						'type' => 'png', 
+					]
+				],
+				[
+					'operation' => ($crop ? 'smartcrop' : 'fit'),
+					'params' => [
+						'width' => $maxX,
+						'height' => $maxY,
+						'type' => 'png', 
+						'norotation' => 'true',
+					]
 				]
-			]
-		];
+			];
+		} else {
+			$quality = $this->config->getAppValue('preview', 'jpeg_quality', '80');
+
+			$operations = [
+				[
+					'operation' => 'autorotate',
+				],
+				[
+					'operation' => ($crop ? 'smartcrop' : 'fit'),
+					'params' => [
+						'width' => $maxX,
+						'height' => $maxY,
+						'stripmeta' => 'true',
+						'type' => $mimeType,
+						'norotation' => 'true',
+						'quality' => $quality,
+					]
+				]
+			];
+		}
 
 		try {
 			$response = $httpClient->post(