mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-20 05:21:29 +02:00
Code Issues Releases Wiki Activity

changed to more robust filename creation

Browse Source
This commit is contained in:
horst-n
2019-04-25 00:21:09 +02:00
parent a5a101a456
commit f3f4e427b0
2 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wire/core/ImageSizerEngineGD.php
View File

@@ -412,8 +412,9 @@ class ImageSizerEngineGD extends ImageSizerEngine {
*/ */
protected function imSaveWebP($im, $filename, $quality = 90) { protected function imSaveWebP($im, $filename, $quality = 90) {
if(!function_exists('imagewebp')) return false; if(!function_exists('imagewebp')) return false;
$newBasename = str_replace(array('.jpg', '.jpeg', '.png', '.gif'), '.webp', basename($filename)); $path_parts = pathinfo($filename);
return imagewebp($im, dirname($filename) . '/' . $newBasename, $quality); $webpFilename = $path_parts['dirname'] . '/' . $path_parts['filename'] . '.webp';
return imagewebp($im, $webpFilename, $quality);
} }
/** /**

73
wire/modules/Image/ImageSizerEngineIMagick/ImageSizerEngineIMagick.module
View File

@@ -24,6 +24,7 @@ class ImageSizerEngineIMagick extends ImageSizerEngine {
* *
*/ */
protected $im = null; protected $im = null;
protected $imWebp = null;
// @todo the following need phpdoc // @todo the following need phpdoc
protected $workspaceColorspace; protected $workspaceColorspace;
@@ -80,9 +81,14 @@ class ImageSizerEngineIMagick extends ImageSizerEngine {
* *
*/ */
protected function release() { protected function release() {
if(!is_object($this->im)) return; if(is_object($this->im)) {
$this->im->clear(); $this->im->clear();
$this->im->destroy(); $this->im->destroy();
}
if(is_object($this->imWebp)) {
$this->imWebp->clear();
$this->imWebp->destroy();
}
} }
/** /**
@@ -176,7 +182,8 @@ class ImageSizerEngineIMagick extends ImageSizerEngine {
protected function processResize($srcFilename, $dstFilename, $fullWidth, $fullHeight, $finalWidth, $finalHeight) { protected function processResize($srcFilename, $dstFilename, $fullWidth, $fullHeight, $finalWidth, $finalHeight) {
$this->setTimeLimit(120); $this->setTimeLimit(120);
my_var_dump([$srcFilename, $dstFilename, $fullWidth, $fullHeight, $finalWidth, $finalHeight]);
die('RIP');
// start image magick // start image magick
$this->im = new \IMagick(); $this->im = new \IMagick();
@@ -353,7 +360,15 @@ class ImageSizerEngineIMagick extends ImageSizerEngine {
$this->im->setImageDepth(($this->imageDepth > 8 ? 8 : $this->imageDepth)); $this->im->setImageDepth(($this->imageDepth > 8 ? 8 : $this->imageDepth));
// prepare to save file
// prepare to save file(s)
if($this->webpAdd) {
$this->imWebp = clone $this->im;
}
$this->im->setImageFormat($this->imageFormat); $this->im->setImageFormat($this->imageFormat);
$this->im->setImageType($this->imageType); $this->im->setImageType($this->imageType);
if(in_array(strtoupper($this->imageFormat), array('JPG', 'JPEG'))) { if(in_array(strtoupper($this->imageFormat), array('JPG', 'JPEG'))) {
@@ -367,6 +382,37 @@ class ImageSizerEngineIMagick extends ImageSizerEngine {
$this->im->setImageCompressionQuality($this->quality); $this->im->setImageCompressionQuality($this->quality);
} }
// write to file(s)
$result = false;
switch($this->imageType) {
case \IMAGETYPE_GIF:
// optionally save an additional WebP file
// save the final GIF image file
#$result = imagegif($thumb, $dstFilename);
break;
case \IMAGETYPE_PNG:
// optionally save an additional WebP file
if($this->webpAdd) {
#$resultWebp = $this->imSaveWebP($thumb, $srcFilename, $this->webpQuality);
}
// save the final PNG image file and always use highest compression level (9) per @horst
#$result = imagepng($thumb, $dstFilename, 9);
break;
case \IMAGETYPE_JPEG:
// optionally save an additional WebP file
if($this->webpAdd) {
#$resultWebp = $this->imSaveWebP($thumb, $srcFilename, $this->webpQuality);
}
// save the final JPEG image file
#$result = imagejpeg($thumb, $dstFilename, $this->quality);
break;
}
// save to file // save to file
$this->wire('files')->unlink($dstFilename); $this->wire('files')->unlink($dstFilename);
@clearstatcache(dirname($dstFilename)); @clearstatcache(dirname($dstFilename));
@@ -378,6 +424,23 @@ class ImageSizerEngineIMagick extends ImageSizerEngine {
$this->release(); $this->release();
return false; return false;
} }
// optionally create a WebP dependency file
if($this->webpAdd) {
$path_parts = pathinfo($dstFilename);
$webpFilename = $path_parts['dirname'] . '/' . $path_parts['filename'] . '.webp';
// prepare for webp output
$this->imWebp->setImageFormat('webp');
$this->imWebp->setImageCompressionQuality($this->webpQuality);
#$this->imWebp->setOption('webp:method', '6');
#$this->imWebp->setOption('webp:lossless', 'true');
// save to file
$this->wire('files')->unlink($webpFilename);
@clearstatcache(dirname($webpFilename));
if(!file_put_contents($webpFilename, $this->imWebp)) {
$this->release();
return false;
}
}
// release and return to event-object // release and return to event-object
$this->release(); $this->release();