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