t_a/cavepaintingsFork
1
Fork 0
forked from Cavemanon/cavepaintings
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mime type handling overhaul

Browse Source 
Changed mime type map to deal with the reality that certain file types have multiple extensions and/or multiple mime types, as well as constants supporting all of the data. Created new functions using the updated mime type map to resolve mime types and extensions. Updated various items around the project that determine mime/extension to take advantage of the new functions.
This commit is contained in:
Matthew Barbour
2020-05-28 10:05:20 -05:00
committed by Shish
parent 16c58e266b
commit 63b2601e67
41 changed files with 575 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ext/transcode/main.php
View File

@@ -17,20 +17,20 @@ class TranscodeImage extends Extension
const ACTION_BULK_TRANSCODE = "bulk_transcode";
const INPUT_FORMATS = [
"BMP" => "bmp",
"GIF" => "gif",
"ICO" => "ico",
"JPG" => "jpg",
"PNG" => "png",
"PSD" => "psd",
"TIFF" => "tiff",
"WEBP" => "webp",
"BMP" => EXTENSION_BMP,
"GIF" => EXTENSION_GIF,
"ICO" => EXTENSION_ICO,
"JPG" => EXTENSION_JPG,
"PNG" => EXTENSION_PNG,
"PSD" => EXTENSION_PSD,
"TIFF" => EXTENSION_TIFF,
"WEBP" => EXTENSION_WEBP,
];
const OUTPUT_FORMATS = [
"" => "",
"JPEG (lossy)" => "jpg",
"PNG (lossless)" => "png",
"JPEG (lossy)" => EXTENSION_JPG,
"PNG (lossless)" => EXTENSION_PNG,
"WEBP (lossy)" => Media::WEBP_LOSSY,
"WEBP (lossless)" => Media::WEBP_LOSSLESS,
];
@@ -102,7 +102,7 @@ class TranscodeImage extends Extension
$ext = Media::normalize_format($ext);
if ($event->type=="gif"&&Media::is_animated_gif($event->tmpname)) {
if ($event->type==EXTENSION_GIF&&Media::is_animated_gif($event->tmpname)) {
return;
}
@@ -314,14 +314,14 @@ class TranscodeImage extends Extension
try {
$result = false;
switch ($target_format) {
case "webp":
case EXTENSION_WEBP:
case Media::WEBP_LOSSY:
$result = imagewebp($image, $tmp_name, $q);
break;
case "png":
case EXTENSION_PNG:
$result = imagepng($image, $tmp_name, 9);
break;
case "jpg":
case EXTENSION_JPG:
// In case of alpha channels
$width = imagesx($image);
$height = imagesy($image);
@@ -376,7 +376,7 @@ class TranscodeImage extends Extension
case Media::WEBP_LOSSY:
$args .= '';
break;
case "png":
case EXTENSION_PNG:
$args .= '-define png:compression-level=9';
break;
default:
@@ -387,7 +387,7 @@ class TranscodeImage extends Extension
$source_type = "";
switch ($source_format) {
case "ico":
case EXTENSION_ICO:
$source_type = "ico:";
}