Joost/pics
1
0
Fork 0
forked from Public/pics
Code Issues Pull Requests Projects Releases Wiki Activity

Thumbnail class: minor refactor of generate method

Browse Source
This commit is contained in:
Aaron van Geffen 2022-07-07 13:51:03 +02:00
parent 56b60b74bc
commit 086102d007
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
models/Thumbnail.php
View File

@ -255,14 +255,18 @@ class Thumbnail
'_' . $this->width . 'x' . $this->height . $this->filename_suffix . '.' . $ext; '_' . $this->width . 'x' . $this->height . $this->filename_suffix . '.' . $ext;
// Ensure the thumbnail subdirectory exists. // Ensure the thumbnail subdirectory exists.
if (!is_dir(THUMBSDIR . '/' . $this->image->getSubdir())) $target_dir = THUMBSDIR . '/' . $this->image->getSubdir();
mkdir(THUMBSDIR . '/' . $this->image->getSubdir(), 0755, true); if (!is_dir($target_dir))
mkdir($target_dir, 0755, true);
if (!is_writable($target_dir))
throw new Exception('Thumbnail directory is not writable!');
// No need to preserve every detail. // No need to preserve every detail.
$thumb->setImageCompressionQuality(80); $thumb->setImageCompressionQuality(80);
// Save it in a public spot. // Save it in a public spot.
$thumb->writeImage(THUMBSDIR . '/' . $this->image->getSubdir() . '/' . $thumb_filename); $thumb->writeImage($target_dir . '/' . $thumb_filename);
// Let's remember this for future reference... // Let's remember this for future reference...
$this->markAsGenerated($thumb_filename); $this->markAsGenerated($thumb_filename);
@ -273,7 +277,6 @@ class Thumbnail
// Finally, return the URL for the generated thumbnail image. // Finally, return the URL for the generated thumbnail image.
return THUMBSURL . '/' . $this->image->getSubdir() . '/' . $thumb_filename; return THUMBSURL . '/' . $this->image->getSubdir() . '/' . $thumb_filename;
} }
// Blast! Curse your sudden but inevitable betrayal!
catch (ImagickException $e) catch (ImagickException $e)
{ {
throw new Exception('ImageMagick error occurred while generating thumbnail. Output: ' . $e->getMessage()); throw new Exception('ImageMagick error occurred while generating thumbnail. Output: ' . $e->getMessage());
@ -331,12 +334,11 @@ class Thumbnail
if ($success) if ($success)
{ {
$thumb_selector = $this->width . 'x' . $this->height . $this->filename_suffix; $thumb_selector = $this->width . 'x' . $this->height . $this->filename_suffix;
$this->thumbnails[$thumb_selector] = $filename !== 'NULL' ? $filename : ''; $this->thumbnails[$thumb_selector] = $filename !== 'NULL' ? $filename : null;
return $success;
} }
else else
throw new UnexpectedValueException('Thumbnail queuing query failed'); throw new UnexpectedValueException('Thumbnail queuing query failed');
return $success;
} }
private function markAsQueued() private function markAsQueued()