sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 16:33:00 +00:00
Code Activity

Rewrite preview generation to use php imagick

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-04-06 16:20:53 +01:00
parent 1dff8070dd
commit bc33205e6b
5 changed files with 24 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
build/index.php
View file

@ -355,6 +355,8 @@ textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-wei
.cursor-query { cursor: help; } .cursor-query { cursor: help; }
summary { cursor: pointer; }
.larger { color: rgb(9, 180, 0); } .larger { color: rgb(9, 180, 0); }
.smaller, .deletion { color: rgb(207, 28, 17); } .smaller, .deletion { color: rgb(207, 28, 17); }
.nochange { color: rgb(132, 123, 199); font-style: italic; } .nochange { color: rgb(132, 123, 199); font-style: italic; }
@ -1798,7 +1800,7 @@ function render_recent_change($rchange)
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
$result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>"; $result .= "<a href='?page=$rchange->page'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>";
break; break;
case "deletion": case "deletion":
@ -1808,7 +1810,7 @@ function render_recent_change($rchange)
case "upload": case "upload":
$resultClasses[] = "upload"; $resultClasses[] = "upload";
$result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")"; $result .= "<a href='?page=$rchange->page'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")";
break; break;
} }
@ -2626,63 +2628,25 @@ register_module([
if(isset($_GET["type"]) and in_array($_GET["type"], [ "image/png", "image/jpeg", "image/webp" ])) if(isset($_GET["type"]) and in_array($_GET["type"], [ "image/png", "image/jpeg", "image/webp" ]))
$output_mime = $_GET["type"]; $output_mime = $_GET["type"];
$preview_image = false; $preview_image = new Imagick();
switch(substr($mime_type, 0, strpos($mime_type, "/"))) switch(substr($mime_type, 0, strpos($mime_type, "/")))
{ {
case "image": case "image":
// Read in the image $preview_image->readImage($filepath);
$image = false;
switch($mime_type)
{
case "image/jpeg":
$image = imagecreatefromjpeg($filepath);
break;
case "image/gif":
$image = imagecreatefromgif($filepath);
break;
case "image/png":
$image = imagecreatefrompng($filepath);
break;
case "image/webp":
$image = imagecreatefromwebp($filepath);
break;
default:
http_response_code(415);
$image = errorimage("Unsupported image type.");
break;
}
// Get the size of the image for later
$raw_width = imagesx($image);
$raw_height = imagesy($image);
// Resize the image
$preview_image = resize_image($image, $target_size);
// Delete the temporary image.
imagedestroy($image);
break; break;
default: default:
http_response_code(501); http_response_code(501);
$preview_image = errorimage("Unrecognised file type '$mime_type'."); $preview_image = errorimage("Unrecognised file type '$mime_type'.");
} }
// Scale the image down to the target size
$preview_image->resizeImage($target_size, $target_size, imagick::FILTER_LANCZOS, 1, true);
// Send the completed preview image to the user // Send the completed preview image to the user
header("content-type: $output_mime"); header("content-type: $output_mime");
switch($output_mime) $outputFormat = substr($mime_type, strpos($mime_type, "/") + 1);
{ $preview_image->setImageFormat($outputFormat);
case "image/jpeg": echo($preview_image->getImageBlob());
imagejpeg($preview_image);
break;
case "image/png":
imagepng($preview_image);
break;
default:
case "image/webp":
imagewebp($preview_image);
break;
}
imagedestroy($preview_image);
}); });
page_renderer::register_part_preprocessor(function(&$parts) { page_renderer::register_part_preprocessor(function(&$parts) {
@ -2775,26 +2739,6 @@ function errorimage($text)
return $image; return $image;
} }
function resize_image($image, $size)
{
$cur_width = imagesx($image);
$cur_height = imagesy($image);
if($cur_width < $size and $cur_height < $size)
return $image;
$width_ratio = $size / $cur_width;
$height_ratio = $size / $cur_height;
$ratio = min($width_ratio, $height_ratio);
$new_height = floor($cur_height * $ratio);
$new_width = floor($cur_width * $ratio);
header("x-resize-to: $new_width x $new_height\n");
return imagescale($image, $new_width, $new_height);
}

4
module_index.json
View file

@ -41,7 +41,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds recent changes. Access through the 'recent-changes' action.", "description": "Adds recent changes. Access through the 'recent-changes' action.",
"id": "feature-recent-changes", "id": "feature-recent-changes",
"lastupdate": 1459952614, "lastupdate": 1459954970,
"optional": false "optional": false
}, },
{ {
@ -68,7 +68,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.",
"id": "feature-upload", "id": "feature-upload",
"lastupdate": 1459695742, "lastupdate": 1459955981,
"optional": false "optional": false
}, },
{ {

4
modules/feature-recent-changes.php
View file

@ -202,7 +202,7 @@ function render_recent_change($rchange)
if(!empty($rchange->newpage)) if(!empty($rchange->newpage))
$resultClasses[] = "newpage"; $resultClasses[] = "newpage";
$result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>"; $result .= "<a href='?page=$rchange->page'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml <span class='$size_display_class' title='$size_title_display'>($size_display)</span>";
break; break;
case "deletion": case "deletion":
@ -212,7 +212,7 @@ function render_recent_change($rchange)
case "upload": case "upload":
$resultClasses[] = "upload"; $resultClasses[] = "upload";
$result .= "$pageDisplayHtml $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")"; $result .= "<a href='?page=$rchange->page'>$pageDisplayHtml</a> $editorDisplayHtml $timeDisplayHtml (" . human_filesize($rchange->filesize) . ")";
break; break;
} }

72
modules/feature-upload.php
View file

@ -215,63 +215,25 @@ register_module([
if(isset($_GET["type"]) and in_array($_GET["type"], [ "image/png", "image/jpeg", "image/webp" ])) if(isset($_GET["type"]) and in_array($_GET["type"], [ "image/png", "image/jpeg", "image/webp" ]))
$output_mime = $_GET["type"]; $output_mime = $_GET["type"];
$preview_image = false; $preview_image = new Imagick();
switch(substr($mime_type, 0, strpos($mime_type, "/"))) switch(substr($mime_type, 0, strpos($mime_type, "/")))
{ {
case "image": case "image":
// Read in the image $preview_image->readImage($filepath);
$image = false;
switch($mime_type)
{
case "image/jpeg":
$image = imagecreatefromjpeg($filepath);
break;
case "image/gif":
$image = imagecreatefromgif($filepath);
break;
case "image/png":
$image = imagecreatefrompng($filepath);
break;
case "image/webp":
$image = imagecreatefromwebp($filepath);
break;
default:
http_response_code(415);
$image = errorimage("Unsupported image type.");
break;
}
// Get the size of the image for later
$raw_width = imagesx($image);
$raw_height = imagesy($image);
// Resize the image
$preview_image = resize_image($image, $target_size);
// Delete the temporary image.
imagedestroy($image);
break; break;
default: default:
http_response_code(501); http_response_code(501);
$preview_image = errorimage("Unrecognised file type '$mime_type'."); $preview_image = errorimage("Unrecognised file type '$mime_type'.");
} }
// Scale the image down to the target size
$preview_image->resizeImage($target_size, $target_size, imagick::FILTER_LANCZOS, 1, true);
// Send the completed preview image to the user // Send the completed preview image to the user
header("content-type: $output_mime"); header("content-type: $output_mime");
switch($output_mime) $outputFormat = substr($mime_type, strpos($mime_type, "/") + 1);
{ $preview_image->setImageFormat($outputFormat);
case "image/jpeg": echo($preview_image->getImageBlob());
imagejpeg($preview_image);
break;
case "image/png":
imagepng($preview_image);
break;
default:
case "image/webp":
imagewebp($preview_image);
break;
}
imagedestroy($preview_image);
}); });
page_renderer::register_part_preprocessor(function(&$parts) { page_renderer::register_part_preprocessor(function(&$parts) {
@ -364,24 +326,4 @@ function errorimage($text)
return $image; return $image;
} }
function resize_image($image, $size)
{
$cur_width = imagesx($image);
$cur_height = imagesy($image);
if($cur_width < $size and $cur_height < $size)
return $image;
$width_ratio = $size / $cur_width;
$height_ratio = $size / $cur_height;
$ratio = min($width_ratio, $height_ratio);
$new_height = floor($cur_height * $ratio);
$new_width = floor($cur_width * $ratio);
header("x-resize-to: $new_width x $new_height\n");
return imagescale($image, $new_width, $new_height);
}
?> ?>

2
settings.fragment.php
View file

@ -352,6 +352,8 @@ textarea ~ input[type=submit] { margin: 0.5rem 0.8rem; padding: 0.5rem; font-wei
.cursor-query { cursor: help; } .cursor-query { cursor: help; }
summary { cursor: pointer; }
.larger { color: rgb(9, 180, 0); } .larger { color: rgb(9, 180, 0); }
.smaller, .deletion { color: rgb(207, 28, 17); } .smaller, .deletion { color: rgb(207, 28, 17); }
.nochange { color: rgb(132, 123, 199); font-style: italic; } .nochange { color: rgb(132, 123, 199); font-style: italic; }