wip

Author: freekmurze

src/Conversions/Actions/PerformManipulationsAction.php

@@ -14,7 +14,7 @@ class PerformManipulationsAction
     public function execute(
         Media $media,
         Conversion $conversion,
-        string $imageFile
+        string $imageFile,
     ): string {
 
         if ($conversion->getManipulations()->isEmpty()) {
@@ -43,7 +43,7 @@ public function execute(
     protected function getConversionTempFileName(
         Media $media,
         Conversion $conversion,
-        string $imageFile
+        string $imageFile,
     ): string {
         $directory = pathinfo($imageFile, PATHINFO_DIRNAME);
 

src/Conversions/Conversion.php

@@ -3,7 +3,9 @@
 namespace Spatie\MediaLibrary\Conversions;
 
 use BadMethodCallException;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Traits\Conditionable;
+use Spatie\ImageOptimizer\OptimizerChainFactory;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Spatie\MediaLibrary\Support\FileNamer\FileNamer;
 
@@ -31,11 +33,13 @@ class Conversion
     protected int $pdfPageNumber = 1;
 
     public function __construct(
-        protected string $name
+        protected string $name,
     ) {
-        // TODO: convert to jpg by default, implement optimizers
+        $optimizerChain = OptimizerChainFactory::create(config('media-library.image_optimizers'));
 
-        $this->manipulations = new Manipulations();
+        $this->manipulations = (new Manipulations())
+            ->optimize($optimizerChain)
+            ->format('jpg');
 
         /*
         $this->manipulations = (new Manipulations())
@@ -218,7 +222,7 @@ public function getResultExtension(string $originalFileExtension = ''): string
             }
         }
 
-        if ($manipulationArgument = $this->manipulations->getManipulationArgument('format')) {
+        if ($manipulationArgument = Arr::get($this->manipulations->getManipulationArgument('format'), 0)) {
             return $manipulationArgument;
         }
 

src/Conversions/Manipulations.php

@@ -3,7 +3,6 @@
 namespace Spatie\MediaLibrary\Conversions;
 
 use Spatie\Image\Drivers\ImageDriver;
-use Spatie\Image\Image;
 
 /** @mixin \Spatie\Image\Drivers\ImageDriver */
 class Manipulations

tests/TestSupport/TestModels/TestModelWithConversion.php

@@ -12,10 +12,8 @@ public function registerMediaConversions(Media $media = null): void
             ->width(50)
             ->nonQueued();
 
-        /*
         $this->addMediaConversion('keep_original_format')
             ->keepOriginalImageFormat()
             ->nonQueued();
-        */
     }
 }