Allow regenerate to queue all conversions (#3793)

* Allow regenerate to queue all conversions

* Better naming

* Update RegenerateCommand.php

---------

Co-authored-by: Freek Van der Herten <[email protected]>

Author: patrickomeara

src/Conversions/Commands/RegenerateCommand.php

@@ -22,7 +22,8 @@ class RegenerateCommand extends Command
     {--X|exclude-starting-id : Exclude the provided id when regenerating from a specific id}
     {--only-missing : Regenerate only missing conversions}
     {--with-responsive-images : Regenerate responsive images}
-    {--force : Force the operation to run when in production}';
+    {--force : Force the operation to run when in production}
+    {--queue-all : Queue all conversions, even non-queued ones}';
 
     protected $description = 'Regenerate the derived images of media';
 
@@ -56,7 +57,8 @@ public function handle(MediaRepository $mediaRepository, FileManipulator $fileMa
                     $media,
                     Arr::wrap($this->option('only')),
                     $this->option('only-missing'),
-                    $this->option('with-responsive-images')
+                    $this->option('with-responsive-images'),
+                    $this->option('queue-all'),
                 );
             } catch (Exception $exception) {
                 $this->errorMessages[$media->getKey()] = $exception->getMessage();

src/Conversions/FileManipulator.php

@@ -18,7 +18,8 @@ public function createDerivedFiles(
         Media $media,
         array $onlyConversionNames = [],
         bool $onlyMissing = false,
-        bool $withResponsiveImages = false
+        bool $withResponsiveImages = false,
+        bool $queueAll = false,
     ): void {
         if (! $this->canConvertMedia($media)) {
             return;
@@ -33,7 +34,7 @@ public function createDerivedFiles(
                 return in_array($conversion->getName(), $onlyConversionNames);
             })
             ->filter(fn (Conversion $conversion) => $conversion->shouldBePerformedOn($media->collection_name))
-            ->partition(fn (Conversion $conversion) => $conversion->shouldBeQueued());
+            ->partition(fn (Conversion $conversion) => $queueAll || $conversion->shouldBeQueued());
 
         $this
             ->performConversions($conversions, $media, $onlyMissing)

tests/Conversions/Commands/RegenerateCommandTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Queue;
+use Spatie\MediaLibrary\Conversions\Jobs\PerformConversionsJob;
 use Spatie\MediaLibrary\Tests\TestSupport\TestModels\TestModelWithConversion;
 
 it('can regenerate all files', function () {
@@ -364,3 +366,19 @@
 
     expect($media->updated_at)->toBeGreaterThanOrEqual(now()->subSeconds(5));
 });
+
+it('can force queue non-queued conversions', function () {
+    Queue::fake();
+
+    $media = $this->testModelWithConversion
+        ->addMedia($this->getTestFilesDirectory('test.jpg'))
+        ->toMediaCollection('images');
+
+    unlink($thumbConversion = $this->getMediaDirectory("{$media->id}/conversions/test-thumb.jpg"));
+
+    $this->artisan('media-library:regenerate', ['--queue-all' => true]);
+
+    $this->assertFileDoesNotExist($this->getMediaDirectory($thumbConversion));
+
+    Queue::assertPushed(PerformConversionsJob::class);
+});