thumb: move imagemagick execution to separate function

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index 28f3b9e2759ee78e13682f93e625f113f8686ee8..66de10673a1dc4235f96f70a4b11b3769b70fbdd 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -20,23 +20,37 @@ if (!file_exists($imgpath)) {
 
 $target = "thumb/$height/$imgpath";
 if (!file_exists($target)) {
+       try {
+               mkthumb($imgpath, $target, $width, $height);
+       }
+       catch (Exception $e) {
+               http_response_code(500);
+               trigger_error("thumbnail creation failed: ".$e->getMessage(), E_USER_WARNING);
+               exit;
+       }
+}
+
+header('Content-type: '.mime_content_type($target));
+readfile($target);
+exit;
+
+function mkthumb($source, $target, $width, $height)
+{
        @mkdir(dirname($target), 0777, TRUE);
+       return mkthumb_exec($source, $target, $width, $height);
+}
 
+function mkthumb_exec($source, $target, $width, $height)
+{
        $cmd = implode(' ', array_map('escapeshellarg', [
                'convert',
                '-trim',
                '-resize', "${width}x${height}",
                '-quality', '90%',
-               $imgpath, $target
+               $source, $target
        ]));
        $return = shell_exec("$cmd 2>&1");
        if ($return) {
-               http_response_code(500);
-               trigger_error("thumbnail creation failed: $return", E_USER_WARNING);
-               exit;
+               throw new Exception($return);
        }
 }
-
-header('Content-type: '.mime_content_type($target));
-readfile($target);
-exit;