X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/31de5ab9716df36202127e9b1657ace23d499c4c..HEAD:/thumb/index.php

diff --git a/thumb/index.php b/thumb/index.php
index e8b3bcb..9232b33 100644
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,42 +1,94 @@
 <?php
-ob_clean();
-
-list ($height, $imgpath) = explode('/', ltrim($Args, '/'), 2);
-$width= 1000;
+if ($Page->api) return;
+$imgpath = ltrim($Page->path, '/');
+if (!preg_match('{^[0-9x]+/}', $imgpath)) {
+	return;
+}
+list ($size, $imgpath) = explode('/', $imgpath, 2);
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
+$ext = ''; # explicit file type request
 
-if (!file_exists($imgpath)) {
+if (preg_match('/(.*)(\.jpg)$/', $imgpath, $imgpart) and file_exists($imgpart[1])) {
+	# source file without requested thumb extension
+	list (, $imgpath, $ext) = $imgpart;
+}
+elseif (!file_exists($imgpath)) {
 	http_response_code(404);
-	exit;
+	$imgpath = '404.png';
+	if (!file_exists($imgpath)) {
+		exit;
+	}
 }
+$target = "thumb/$size/$imgpath$ext";
 
-$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, $size, $target);
+}
+catch (Throwable $e) {
+	http_response_code($e->getCode() ?: 500);
+	header("X-Error: ".explode("\n", $e->getMessage())[0], FALSE);
+	$target = '500.png';
+	if (file_exists($target)) {
+		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));
+header('Cache-Control: max-age=2628000');
+header('Content-Type: '.mime_content_type($target));
+header('Content-Length: '.filesize($target));
 readfile($target);
 exit;
 
-function mkthumb($source, $target, $width, $height)
+function mkthumb($source, $size, $target)
 {
+	if (strpos($size, 'x') !== FALSE) {
+		list ($width, $height) = explode('x', $size);
+		if (empty($height)) {
+			$height = $width * 4;
+		}
+	}
+	else {
+		$height = $size;
+	}
+	if (empty($width)) {
+		$width = $height * 4;
+	}
+
+	if (isset($_GET['backend'])) {
+		$backend = $_GET['backend'];
+	}
+	elseif (file_exists($target)) {
+		return $target;
+	}
+	elseif (extension_loaded('gd')) {
+		$backend = 'gd';
+	}
+	else {
+		$backend = 'exec';
+	}
+	$backend = "mkthumb_$backend";
+
 	@mkdir(dirname($target), 0777, TRUE);
-	return mkthumb_exec($source, $target, $width, $height);
+	$backend($source, $target, $width, $height);
+	return $target;
+}
+
+function mkthumb_gd($source, $target, $width, $height)
+{
+	$data = imagecreatefromstring(file_get_contents($source));
+	if (!$data) throw new Exception("error reading $source");
+	$orgwidth = imagesx($data);
+	$orgheight = imagesy($data);
+	$width = min($width, $orgwidth * $height / $orgheight);
+	$gd = imagecreatetruecolor($width, $height);
+	//TODO: trim
+	imagecopyresampled($gd, $data, 0, 0, 0, 0,
+			$width, $height, $orgwidth, $orgheight);
+	imagejpeg($gd, $target, 90);
 }
 
 function mkthumb_exec($source, $target, $width, $height)
@@ -46,10 +98,16 @@ function mkthumb_exec($source, $target, $width, $height)
 	}
 	$cmd = implode(' ', array_map('escapeshellarg', [
 		'convert',
+		'-delete', '1--1', # static
 		'-trim',
-		'-resize', "${width}x${height}",
-		'-quality', '90%',
-		$source, $target
+		'-background', 'white', '-layers', 'flatten', # opaque
+		'-auto-orient', # apply exif rotation
+		'-interlace', 'plane', # progressive
+		'-strip', '-taint', # omit metadata
+		'-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
+		'-resize', "${width}x${height}>",
+		'-quality', '85%',
+		$source, "jpg:$target"
 	]));
 	$return = shell_exec("$cmd 2>&1");
 	if ($return) {