UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-27 08:43:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4287 from pixelfed/staging

Browse source 
Update ImageOptimizePipeline, improve support for disabling image opt…
This commit is contained in:
daniel 2023-04-09 16:11:04 -06:00 committed by GitHub
commit eba44b62e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Jobs/ImageOptimizePipeline/ImageOptimize.php
View file

@ -39,16 +39,18 @@ class ImageOptimize implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
if(config('pixelfed.optimize_image') == false) {
return;
}
$media = $this->media; $media = $this->media;
$path = storage_path('app/'.$media->media_path); $path = storage_path('app/'.$media->media_path);
if (!is_file($path) || $media->skip_optimize) { if (!is_file($path) || $media->skip_optimize) {
return; return;
} }
ImageResize::dispatch($media)->onQueue('mmo'); if(config('pixelfed.optimize_image') == false) {
ImageThumbnail::dispatch($media)->onQueue('mmo');
return;
} else {
ImageResize::dispatch($media)->onQueue('mmo');
return;
}
} }
} }

4
app/Jobs/ImageOptimizePipeline/ImageResize.php
View file

@ -49,6 +49,10 @@ class ImageResize implements ShouldQueue
return; return;
} }
if(!config('pixelfed.optimize_image')) {
ImageThumbnail::dispatch($media)->onQueue('mmo');
return;
}
try { try {
$img = new Image(); $img = new Image();
$img->resizeImage($media); $img->resizeImage($media);

10
app/Jobs/ImageOptimizePipeline/ImageUpdate.php
View file

@ -61,10 +61,12 @@ class ImageUpdate implements ShouldQueue
return; return;
} }
if (in_array($media->mime, $this->protectedMimes) == true) { if(config('pixelfed.optimize_image')) {
ImageOptimizer::optimize($thumb); if (in_array($media->mime, $this->protectedMimes) == true) {
if(!$media->skip_optimize) { ImageOptimizer::optimize($thumb);
ImageOptimizer::optimize($path); if(!$media->skip_optimize) {
ImageOptimizer::optimize($path);
}
} }
} }