|
|
|
@ -16,70 +16,71 @@ use App\Jobs\MediaPipeline\MediaStoragePipeline;
|
|
|
|
|
|
|
|
|
|
|
|
class ImageUpdate implements ShouldQueue
|
|
|
|
class ImageUpdate implements ShouldQueue
|
|
|
|
{
|
|
|
|
{
|
|
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
|
|
|
|
|
|
|
|
protected $media;
|
|
|
|
protected $media;
|
|
|
|
|
|
|
|
|
|
|
|
protected $protectedMimes = [
|
|
|
|
protected $protectedMimes = [
|
|
|
|
'image/jpeg',
|
|
|
|
'image/jpeg',
|
|
|
|
'image/png',
|
|
|
|
'image/png',
|
|
|
|
'image/webp'
|
|
|
|
'image/webp',
|
|
|
|
];
|
|
|
|
'image/avif'
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Delete the job if its models no longer exist.
|
|
|
|
* Delete the job if its models no longer exist.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @var bool
|
|
|
|
* @var bool
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public $deleteWhenMissingModels = true;
|
|
|
|
public $deleteWhenMissingModels = true;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Create a new job instance.
|
|
|
|
* Create a new job instance.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @return void
|
|
|
|
* @return void
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public function __construct(Media $media)
|
|
|
|
public function __construct(Media $media)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$this->media = $media;
|
|
|
|
$this->media = $media;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Execute the job.
|
|
|
|
* Execute the job.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @return void
|
|
|
|
* @return void
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public function handle()
|
|
|
|
public function handle()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$media = $this->media;
|
|
|
|
$media = $this->media;
|
|
|
|
if(!$media) {
|
|
|
|
if(!$media) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$path = storage_path('app/'.$media->media_path);
|
|
|
|
$path = storage_path('app/'.$media->media_path);
|
|
|
|
$thumb = storage_path('app/'.$media->thumbnail_path);
|
|
|
|
$thumb = storage_path('app/'.$media->thumbnail_path);
|
|
|
|
|
|
|
|
|
|
|
|
if (!is_file($path)) {
|
|
|
|
if (!is_file($path)) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if((bool) config_cache('pixelfed.optimize_image')) {
|
|
|
|
if((bool) config_cache('pixelfed.optimize_image')) {
|
|
|
|
if (in_array($media->mime, $this->protectedMimes) == true) {
|
|
|
|
if (in_array($media->mime, $this->protectedMimes) == true) {
|
|
|
|
ImageOptimizer::optimize($thumb);
|
|
|
|
ImageOptimizer::optimize($thumb);
|
|
|
|
if(!$media->skip_optimize) {
|
|
|
|
if(!$media->skip_optimize) {
|
|
|
|
ImageOptimizer::optimize($path);
|
|
|
|
ImageOptimizer::optimize($path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!is_file($path) || !is_file($thumb)) {
|
|
|
|
if (!is_file($path) || !is_file($thumb)) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$photo_size = filesize($path);
|
|
|
|
$photo_size = filesize($path);
|
|
|
|
$thumb_size = filesize($thumb);
|
|
|
|
$thumb_size = filesize($thumb);
|
|
|
|
$total = ($photo_size + $thumb_size);
|
|
|
|
$total = ($photo_size + $thumb_size);
|
|
|
|
$media->size = $total;
|
|
|
|
$media->size = $total;
|
|
|
|
$media->save();
|
|
|
|
$media->save();
|
|
|
|
|
|
|
|
|
|
|
|
MediaStoragePipeline::dispatch($media);
|
|
|
|
MediaStoragePipeline::dispatch($media);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Daniel Supernault
9 months ago