Skip to content

Generate small preview straight away if Imaginary is enabled #31864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Apr 7, 2022
Merged

Generate small preview straight away if Imaginary is enabled #31864

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Generate small preview straight away if Imaginary is enabled 
Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Apr 6, 2022
commit 3d1f22f6d8720ff0ed574bc21d32ea2a45a42c29
9 changes: 7 additions & 2 deletions lib/private/Preview/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,10 @@ 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'] === 250 && $specifications[0]['height'] === 250)
|| ($specifications[0]['width'] === 150 && $specifications[0]['height'] === 150))
&& ($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;
Expand Down Expand Up @@ -221,6 +222,10 @@ public function generatePreviews(File $file, array $specifications, $mimeType =
return $preview;
}

/**
* Generate a small image straight away without generating a max preview first
* Preview generated is 256x256
*/
private function getSmallImagePreview(ISimpleFolder $previewFolder, File $file, string $mimeType, string $prefix, bool $crop) {
$nodes = $previewFolder->getDirectoryListing();

Expand Down