The code has been changed for clarity

nextcloud#38032 (comment) Signed-off-by: JanisPlayer <54918417+JanisPlayer@users.noreply.github.com>
JanisPlayer · May 11, 2023 · f926d54 · f926d54
1 parent 7993ff3
commit f926d54
Showing 1 changed file with 13 additions and 32 deletions.
diff --git a/lib/private/Preview/Imaginary.php b/lib/private/Preview/Imaginary.php
@@ -84,54 +84,35 @@ public function getCroppedThumbnail(File $file, int $maxX, int $maxY, bool $crop
 		$convert = false;
 		$autorotate = true;
 
-		$preview_format = $this->config->getSystemValueString('preview_format', 'jpeg');
 		switch ($file->getMimeType()) {
 			case 'image/heic':
 				// Autorotate seems to be broken for Heic so disable for that
 				$autorotate = false;
-				switch ($preview_format) {
-					case 'webp':
-						$mimeType = 'webp';
-						break;
-					default:
-						$mimeType = 'jpeg';
-				}
+				$mimeType = 'jpeg';
 				break;
 			case 'image/gif':
 			case 'image/png':
-				switch ($preview_format) {
-					case 'webp':
-						$mimeType = 'webp';
-						break;
-					default:
-						$mimeType = 'png';
-				}
+				$mimeType = 'png';
 				break;
 			case 'image/svg+xml':
 			case 'application/pdf':
 			case 'application/illustrator':
 				$convert = true;
 				// Converted files do not need to be autorotated
 				$autorotate = false;
-				switch ($preview_format) {
-					case 'webp':
-						$mimeType = 'webp';
-						break;
-					default:
-						$mimeType = 'png';
-				}
+				$mimeType = 'png';
+				break;
+			default:
+				$mimeType = 'jpeg';
+		}
+
+		$preview_format = $this->config->getSystemValueString('preview_format', 'jpeg');
+
+		switch ($preview_format) { // Change the format to the correct one
+			case 'webp':
+				$mimeType = 'webp';
 				break;
 			default:
-				switch ($preview_format) {
-					case 'jpeg':
-						$mimeType = 'jpeg';
-						break;
-					case 'webp':
-						$mimeType = 'webp';
-						break;
-					default:
-						$mimeType = 'jpeg';
-				}
 		}
 
 		$operations = [];