harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use imagemagick first stage thumbnail for cover photos, if configured

Browse Source
This commit is contained in:
zotlabs 2018-05-07 23:57:17 -07:00
parent 611e22d676
commit 3c8de7b59d
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Zotlabs/Module/Cover_photo.php
View File

@ -85,8 +85,37 @@ class Cover_photo extends \Zotlabs\Web\Controller {
if($r) { if($r) {
$max_thumb = intval(get_config('system','max_thumbnail',1600));
$iscaled = false;
if(intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) {
$imagick_path = get_config('system','imagick_convert_path');
if($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) {
$fname = dbunescbin($r[0]['content']);
$tmp_name = $fname . '-001';
$newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb]));
$cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -thumbnail ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
// logger('imagick thumbnail command: ' . $cmd);
for($x = 0; $x < 4; $x ++) {
exec($cmd);
if(file_exists($tmp_name)) {
break;
}
}
if(file_exists($tmp_name)) {
$base_image = $r[0];
$gis = getimagesize($tmp_name);
$base_image['width'] = $gis[0];
$base_image['height'] = $gis[1];
$base_image['content'] = @file_get_contents($tmp_name);
$iscaled = true;
@unlink($tmp_name);
}
}
}
if(! $iscaled) {
$base_image = $r[0]; $base_image = $r[0];
$base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content']));
}
$im = photo_factory($base_image['content'], $base_image['mimetype']); $im = photo_factory($base_image['content'], $base_image['mimetype']);
if($im->is_valid()) { if($im->is_valid()) {

5
include/photos.php
View File

@ -84,11 +84,12 @@ function photo_upload($channel, $observer, $args) {
// logger('imagick thumbnail command: ' . $cmd); // logger('imagick thumbnail command: ' . $cmd);
for($x = 0; $x < 4; $x ++) { for($x = 0; $x < 4; $x ++) {
exec($cmd); exec($cmd);
if(! file_exists($tmp_name)) { if(file_exists($tmp_name)) {
break;
}
logger('imagick scale failed. Retrying.'); logger('imagick scale failed. Retrying.');
continue; continue;
} }
}
if(! file_exists($tmp_name)) { if(! file_exists($tmp_name)) {
logger('imagick scale failed. Abort.'); logger('imagick scale failed. Abort.');
return $ret; return $ret;