[ImageThumbnail] Implement image resizing with Intervention/Image

This commit is contained in:
Hugo Sales 2021-04-16 10:46:53 +00:00
parent ee87961d96
commit 4358656c55
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
5 changed files with 116 additions and 4 deletions

View File

@ -206,4 +206,34 @@ abstract class Utils
return ['file_path' => $filepath, 'mimetype' => 'image/svg+xml', 'title' => null]; return ['file_path' => $filepath, 'mimetype' => 'image/svg+xml', 'title' => null];
} }
} }
// ------------------------------
/**
* Get the minor part of a mimetype. image/webp -> image
*/
public static function mimetypeMajor(string $mime)
{
return explode('/', self::mimeBare($mime))[0];
}
/**
* Get the minor part of a mimetype. image/webp -> webp
*/
public static function mimetypeMinor(string $mime)
{
return explode('/', self::mimeBare($mime))[1];
}
/**
* Get only the mimetype and not additional info (separated from bare mime with semi-colon)
*/
public static function mimeBare(string $mimetype)
{
$mimetype = mb_strtolower($mimetype);
if (($semicolon = mb_strpos($mimetype, ';')) !== false) {
$mimetype = mb_substr($mimetype, 0, $semicolon);
}
return trim($mimetype);
}
} }

View File

@ -23,7 +23,10 @@ namespace Plugin\ImageThumbnail\Controller;
use App\Core\Controller; use App\Core\Controller;
use App\Core\DB\DB; use App\Core\DB\DB;
use App\Entity\AttachmentThumbnail;
use App\Util\Common; use App\Util\Common;
use Component\Media\Media;
use Plugin\ImageThumbnail\ImageThumbnail as ThisPlugin;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
class ImageThumbnail extends Controller class ImageThumbnail extends Controller
@ -33,9 +36,9 @@ class ImageThumbnail extends Controller
*/ */
public function thumbnail(Request $request, int $id) public function thumbnail(Request $request, int $id)
{ {
$attachemnt = DB::findOneBy('attachment', ['id' => $id]); $attachment = DB::findOneBy('attachment', ['id' => $id]);
if (!is_null($attachemnt->getScope())) { if (!is_null($attachment->getScope())) {
// && ($attachemnt->scope | VisibilityScope::PUBLIC) != 0 // && ($attachment->scope | VisibilityScope::PUBLIC) != 0
// $user = Common::ensureLoggedIn(); // $user = Common::ensureLoggedIn();
assert(false, 'Attachment scope not implemented'); assert(false, 'Attachment scope not implemented');
} }
@ -48,6 +51,12 @@ class ImageThumbnail extends Controller
$height = Common::clamp($this->int('h') ?? $max_height, min: 0, max: $max_height); $height = Common::clamp($this->int('h') ?? $max_height, min: 0, max: $max_height);
$crop = $this->bool('c') ?? false; $crop = $this->bool('c') ?? false;
dd($width, $height, $crop); $filename = $attachment->getFilename();
$filepath = ThisPlugin::getPath($attachment);
$thumbnail = AttachmentThumbnail::getOrCreate(attachment: $attachment, width: $width, height: $height, crop: $crop);
dd($thumbnail);
return Media::sendFile(filepath: $filepath, mimetype: $attachment->getMimetype(), output_filename: $filename, disposition: 'inline');
} }
} }

View File

@ -20,8 +20,12 @@
namespace Plugin\ImageThumbnail; namespace Plugin\ImageThumbnail;
use App\Core\Event; use App\Core\Event;
use function App\Core\I18n\_m;
use App\Core\Modules\Module; use App\Core\Modules\Module;
use App\Core\Router\RouteLoader; use App\Core\Router\RouteLoader;
use App\Entity\Attachment;
use App\Util\Common;
use Intervention\Image\Image;
class ImageThumbnail extends Module class ImageThumbnail extends Module
{ {
@ -30,4 +34,49 @@ class ImageThumbnail extends Module
$r->connect('thumbnail', '/thumbnail/{id<\d+>}', [Controller\ImageThumbnail::class, 'thumbnail']); $r->connect('thumbnail', '/thumbnail/{id<\d+>}', [Controller\ImageThumbnail::class, 'thumbnail']);
return Event::next; return Event::next;
} }
public static function getPath(Attachment $attachment)
{
return Common::config('attachments', 'dir') . $attachment->getFilename();
}
/**
* Resizes an image. It will reencode the image in the
* `self::prefferedType()` format. This only applies henceforward,
* not retroactively
*
* Increases the 'memory_limit' to the one in the 'attachments' section in the config, to
* enable the handling of bigger images, which can cause a peak of memory consumption, while
* encoding
*
* @throws Exception
*/
public function onResizeImage(Attachment $attachment, string $outpath, int $width, int $height, bool $crop)
{
$old_limit = ini_set('memory_limit', Common::config('attachments', 'memory_limit'));
// try {
// $img = Image::make($this->filepath);
// } catch (Exception $e) {
// Log::error(__METHOD__ . ' encountered exception: ' . print_r($e, true));
// // TRANS: Exception thrown when trying to resize an unknown file type.
// throw new Exception(_m('Unknown file type'));
// }
// if (self::getPath($attachment) === $outpath) {
// @unlink($outpath);
// }
// // Fit image to dimensions and optionally prevent upscaling
// if (!$crop) $img->fit($width, $height, function ($constraint) { $constraint->upsize();});
// else $img->crop($width, $height);
// $img->save($outpath, 100, 'webp');
// $img->destroy();
// ini_set('memory_limit', $old_limit); // Restore the old memory limit
// return $outpath;
return Event::next;
}
} }

View File

@ -21,7 +21,13 @@
namespace App\Entity; namespace App\Entity;
use App\Core\DB\DB;
use App\Core\Entity; use App\Core\Entity;
use App\Core\Event;
use App\Core\Log;
use App\Util\Exception\NotFoundException;
use App\Util\Exception\ServerException;
use Component\Media\Media;
use DateTimeInterface; use DateTimeInterface;
/** /**
@ -92,6 +98,24 @@ class AttachmentThumbnail extends Entity
// }}} Autocode // }}} Autocode
public static function getOrCreate(Attachment $attachment, ?int $width = null, ?int $height = null, ?bool $crop = null)
{
try {
return DB::findOneBy('attachment_thumbnail', ['attachment_id' => $attachment->getId(), 'width' => $width, 'height' => $height]);
} catch (NotFoundException $e) {
$outpath = $attachment->getFileHash() . '-' . $width . 'x' . $height;
$event_map = ['image' => 'ResizeImage', 'video' => 'ResizeVideo'];
$major_mime = Media::mimetypeMajor($attachment->getMimetype());
if (in_array($major_mime, array_keys($event_map))) {
Event::handle($event_map[$major_mime], [$attachment, $outpath, $width, $height, $crop]);
} else {
Log::debug($m = ('Cannot resize attachment with mimetype ' . $attachment->getMimetype()));
throw new ServerException($m);
}
}
}
/** /**
* Delete a attachment thumbnail. This table doesn't own all the attachments, only itself * Delete a attachment thumbnail. This table doesn't own all the attachments, only itself
*/ */