From df9e52e15004f719f85722c8396e015499696470 Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Sat, 30 Sep 2023 20:08:35 +0200 Subject: [PATCH] Generate all preview sizes for Imaginary A follow up on https://github.com/nextcloud/server/pull/40670 Based on discussions here: https://github.com/nextcloud/server/issues/38911#issuecomment-1741819188 This fixes the case were not all previews are generated, for example in the activity view: https://github.com/nextcloud/server/issues/38911#issuecomment-1738886106 Signed-off-by: Daniel Hansson --- lib/private/Preview/Generator.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php index b9ea5ea1a07d1..9d93a6b3af78b 100644 --- a/lib/private/Preview/Generator.php +++ b/lib/private/Preview/Generator.php @@ -139,23 +139,6 @@ public function generatePreviews(File $file, array $specifications, $mimeType = $previewVersion = $file->getPreviewVersion() . '-'; } - // If imaginary is enabled, and we request a small thumbnail, - // let's not generate the max preview for performance reasons - if (count($specifications) === 1 - && ($specifications[0]['width'] <= 256 || $specifications[0]['height'] <= 256) - && preg_match(Imaginary::supportedMimeTypes(), $mimeType) - && $this->config->getSystemValueString('preview_imaginary_url', 'invalid') !== 'invalid') { - $crop = $specifications[0]['crop'] ?? false; - $preview = $this->getSmallImagePreview($previewFolder, $previewFiles, $file, $mimeType, $previewVersion, $crop); - - if ($preview->getSize() === 0) { - $preview->delete(); - throw new NotFoundException('Cached preview size 0, invalid!'); - } - - return $preview; - } - // Get the max preview and infer the max preview sizes from that $maxPreview = $this->getMaxPreview($previewFolder, $previewFiles, $file, $mimeType, $previewVersion); $maxPreviewImage = null; // only load the image when we need it