thumb: force reload with specified ?backend
authorMischa POSLAWSKY <perl@shiar.org>
Thu, 5 Jul 2018 13:32:01 +0000 (15:32 +0200)
committerMischa POSLAWSKY <perl@shiar.org>
Sat, 7 Jul 2018 11:42:39 +0000 (13:42 +0200)
Option indicates development, in which case cached results should be ignored
as well.

thumb/index.php

index 066e88d7cf9561227d96f8b6a2fe9ff80afacc21..1267919810daf320bbb9e00b9b9e2afd66d5674d 100644 (file)
@@ -14,22 +14,20 @@ if (!file_exists($imgpath)) {
 }
 
 $target = "thumb/$height/$imgpath";
-if (!file_exists($target)) {
-       try {
-               mkthumb($imgpath, $target, $width, $height);
-       }
-       catch (Exception $e) {
-               http_response_code($e->getCode() ?: 500);
-               $target = '500.png';
-               if (file_exists($target)) {
-                       header("X-Error: ".$e->getMessage());
-                       header('Content-type: '.mime_content_type($target));
-                       readfile($target);
-                       exit;
-               }
-               trigger_error("thumbnail creation failed: ".$e->getMessage(), E_USER_WARNING);
+try {
+       mkthumb($imgpath, $target, $width, $height);
+}
+catch (Exception $e) {
+       http_response_code($e->getCode() ?: 500);
+       $target = '500.png';
+       if (file_exists($target)) {
+               header("X-Error: ".$e->getMessage());
+               header('Content-type: '.mime_content_type($target));
+               readfile($target);
                exit;
        }
+       trigger_error("thumbnail creation failed: ".$e->getMessage(), E_USER_WARNING);
+       exit;
 }
 
 header('Content-type: '.mime_content_type($target));
@@ -41,6 +39,9 @@ function mkthumb($source, $target, $width, $height)
        if (isset($_GET['backend'])) {
                $backend = $_GET['backend'];
        }
+       elseif (file_exists($target)) {
+               return;
+       }
        else {
                $backend = 'exec';
        }