Make the assets:generate-presets command queue friendly (#3490)

src/Console/Commands/AssetsGeneratePresets.php

@@ -7,7 +7,7 @@
 use Statamic\Facades\Asset;
 use Statamic\Facades\Config;
 use Statamic\Facades\Image;
-use Statamic\Imaging\PresetGenerator;
+use Statamic\Jobs\GeneratePresetImageManipulation;
 
 class AssetsGeneratePresets extends Command
 {
@@ -18,7 +18,7 @@ class AssetsGeneratePresets extends Command
      *
      * @var string
      */
-    protected $signature = 'statamic:assets:generate-presets';
+    protected $signature = 'statamic:assets:generate-presets {--queue : Queue the image generation.}';
 
     /**
      * The console command description.
@@ -27,27 +27,28 @@ class AssetsGeneratePresets extends Command
      */
     protected $description = 'Generate asset preset manipulations.';
 
-    /**
-     * @var PresetGenerator
-     */
-    protected $generator;
-
     /**
      * @var \Statamic\Assets\AssetCollection
      */
     protected $imageAssets;
 
-    public function __construct(PresetGenerator $generator)
-    {
-        $this->generator = $generator;
-        parent::__construct();
-    }
+    /**
+     * @var bool
+     */
+    protected $shouldQueue = false;
 
     /**
      * Execute the console command.
      */
     public function handle()
     {
+        $this->shouldQueue = $this->option('queue');
+
+        if ($this->shouldQueue && config('queue.default') === 'sync') {
+            $this->error('The queue connection is set to "sync". Queueing will be disabled.');
+            $this->shouldQueue = false;
+        }
+
         $this->imageAssets = Asset::all()->filter(function ($asset) {
             return $asset->isImage();
         });
@@ -97,15 +98,22 @@ private function generatePresets($presets)
     {
         foreach ($presets as $preset => $params) {
             $bar = $this->output->createProgressBar($this->imageAssets->count());
-            $bar->setFormat("[%current%/%max%] Generating <comment>$preset</comment>... %filename%");
+
+            $verb = $this->shouldQueue ? 'Queueing' : 'Generating';
+            $bar->setFormat("[%current%/%max%] $verb <comment>$preset</comment>... %filename%");
 
             foreach ($this->imageAssets as $asset) {
                 $bar->setMessage($asset->basename(), 'filename');
-                $this->generator->generate($asset, $preset);
+
+                $dispatchMethod = $this->shouldQueue ? 'dispatch' : 'dispatchSync';
+                GeneratePresetImageManipulation::$dispatchMethod($asset, $preset);
+
                 $bar->advance();
             }
 
-            $bar->setFormat("<info>[✓] Images generated for <comment>$preset</comment>.</info>");
+            $verb = $this->shouldQueue ? 'queued' : 'generated';
+            $bar->setFormat("<info>[✓] Images $verb for <comment>$preset</comment>.</info>");
+
             $bar->finish();
 
             $this->output->newLine();

src/Jobs/GeneratePresetImageManipulation.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Statamic\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Statamic\Contracts\Assets\Asset;
+use Statamic\Imaging\PresetGenerator;
+
+class GeneratePresetImageManipulation implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable;
+
+    public $asset;
+    public $preset;
+
+    public function __construct(Asset $asset, $preset)
+    {
+        $this->asset = $asset;
+        $this->preset = $preset;
+    }
+
+    public function handle(PresetGenerator $generator)
+    {
+        $generator->generate($this->asset, $this->preset);
+    }
+}