Update Groups ImageResizePipeline with intervention/image v3 support

pull/6000/head
Daniel Supernault 3 weeks ago
parent 9d89425e62
commit 616e37066d
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1

@ -3,15 +3,17 @@
namespace App\Jobs\GroupsPipeline; namespace App\Jobs\GroupsPipeline;
use App\Models\GroupMedia; use App\Models\GroupMedia;
use App\Util\Media\Image; use Exception;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Intervention\Image\Encoders\JpegEncoder;
use Intervention\Image\Encoders\PngEncoder;
use Intervention\Image\ImageManager;
use Log; use Log;
use Storage; use Storage;
use Image as Intervention;
class ImageResizePipeline implements ShouldQueue class ImageResizePipeline implements ShouldQueue
{ {
@ -45,16 +47,16 @@ class ImageResizePipeline implements ShouldQueue
{ {
$media = $this->media; $media = $this->media;
if(!$media) { if (! $media) {
return; return;
} }
if (!Storage::exists($media->media_path) || $media->skip_optimize) { if (! Storage::exists($media->media_path) || $media->skip_optimize) {
return; return;
} }
$path = $media->media_path; $path = $media->media_path;
$file = storage_path('app/' . $path); $file = storage_path('app/'.$path);
$quality = config_cache('pixelfed.image_quality'); $quality = config_cache('pixelfed.image_quality');
$orientations = [ $orientations = [
@ -73,15 +75,43 @@ class ImageResizePipeline implements ShouldQueue
]; ];
try { try {
$img = Intervention::make($file); $driver = match (config('image.driver')) {
$img->orientate(); 'imagick' => \Intervention\Image\Drivers\Imagick\Driver::class,
'vips' => \Intervention\Image\Drivers\Vips\Driver::class,
default => \Intervention\Image\Drivers\Gd\Driver::class
};
$imageManager = new ImageManager(
$driver,
autoOrientation: true,
decodeAnimation: true,
blendingColor: 'ffffff',
strip: true
);
$img = $imageManager->read($file);
$width = $img->width(); $width = $img->width();
$height = $img->height(); $height = $img->height();
$aspect = $width / $height; $aspect = $width / $height;
$orientation = $aspect === 1 ? 'square' : ($aspect > 1 ? 'landscape' : 'portrait'); $orientation = $aspect === 1 ? 'square' : ($aspect > 1 ? 'landscape' : 'portrait');
$ratio = $orientations[$orientation]; $ratio = $orientations[$orientation];
$img->resize($ratio['width'], $ratio['height']);
$img->save($file, $quality); $img = $img->resize($ratio['width'], $ratio['height'], function ($constraint) {
$constraint->aspectRatio();
$constraint->upsize();
});
$extension = pathinfo($file, PATHINFO_EXTENSION);
if (in_array(strtolower($extension), ['jpg', 'jpeg'])) {
$encoder = new JpegEncoder($quality);
} else {
$encoder = new PngEncoder;
}
$encoded = $img->encode($encoder);
file_put_contents($file, $encoded);
} catch (Exception $e) { } catch (Exception $e) {
Log::error($e); Log::error($e);
} }

Loading…
Cancel
Save