kashire/lainchan
4
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

exiftool: Use -overwrite_original. Important bugfix; old images were never being deleted when using exiftool (instead kept as *_original in /tmp)

Browse Source
This commit is contained in:
Michael Foster 2013-08-27 08:55:03 +10:00
parent 319cd2520f
commit 5003a692b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
post.php
View File

@ -526,7 +526,8 @@ if (isset($_POST['delete'])) {
escapeshellarg($upload)); escapeshellarg($upload));
if ($config['use_exiftool'] && !$config['strip_exif']) { if ($config['use_exiftool'] && !$config['strip_exif']) {
if ($exiftool_error = shell_exec_error( if ($exiftool_error = shell_exec_error(
'exiftool -q -orientation=1 -n ' . escapeshellarg($upload))) 'exiftool -overwrite_original -q -q -orientation=1 -n ' .
escapeshellarg($upload)))
error('exiftool failed!', null, $exiftool_error); error('exiftool failed!', null, $exiftool_error);
} else { } else {
// TODO: Find another way to remove the Orientation tag from the EXIF profile // TODO: Find another way to remove the Orientation tag from the EXIF profile
@ -589,7 +590,8 @@ if (isset($_POST['delete'])) {
if ($config['redraw_image'] || (!@$post['exif_stripped'] && $config['strip_exif'] && ($post['extension'] == 'jpg' || $post['extension'] == 'jpeg'))) { if ($config['redraw_image'] || (!@$post['exif_stripped'] && $config['strip_exif'] && ($post['extension'] == 'jpg' || $post['extension'] == 'jpeg'))) {
if (!$config['redraw_image'] && $config['use_exiftool']) { if (!$config['redraw_image'] && $config['use_exiftool']) {
if($error = shell_exec_error('exiftool -ignoreMinorErrors -q -q -all= ' . escapeshellarg($upload))) if($error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
escapeshellarg($upload)))
error('Could not strip EXIF metadata!', null, $error); error('Could not strip EXIF metadata!', null, $error);
} else { } else {
$image->to($post['file']); $image->to($post['file']);