Allow screenshots to be loaded from a folder

composer.json

@@ -29,6 +29,7 @@
         "symfony/config": "^6.4|^7.0",
         "symfony/dependency-injection": "^6.4|^7.0",
         "symfony/filesystem": "^6.4|^7.0",
+        "symfony/finder": "^6.4",
         "symfony/http-kernel": "^6.4|^7.0",
         "symfony/mime": "^6.4|^7.0",
         "symfony/routing": "^6.4|^7.0"

src/Command/GenerateManifestCommand.php

@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
 use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Routing\RouterInterface;
 use function count;
@@ -32,7 +33,7 @@
 {
     private readonly MimeTypes $mime;
 
     public function __construct(
         private readonly null|ImageProcessor $imageProcessor,
         #[Autowire('%spomky_labs_pwa.config%')]
         private readonly array               $config,
@@ -99,9 +100,9 @@
         $hash = mb_substr(hash('sha256', $data), 0, 8);
         file_put_contents($tempFilename, $data);
         $mime = $this->mime->guessMimeType($tempFilename);
         $extension = $this->mime->getExtensions($mime);
 
         if (empty($extension)) {
             throw new RuntimeException(sprintf('Unable to guess the extension for the mime type "%s"', $mime));
         }
 
@@ -112,7 +113,7 @@
         file_put_contents($localFilename, $data);
         $this->filesystem->remove($tempFilename);
 
         return [
             'src' => sprintf('%s/%s', $prefixUrl, $filename),
             'type' => $mime,
         ];
@@ -124,10 +125,10 @@
     private function storeScreenshot(string $data, ?string $format, ?string $formFactor): array
     {
         if ($format !== null) {
             $data = $this->imageProcessor->process($data, null, null, $format);
         }
 
         ['width' => $width, 'height' => $height] = $this->imageProcessor->getSizes($data);
         $size = sprintf('%sx%s', $width, $height);
 
         $fileData = $this->storeFile(
@@ -142,12 +143,12 @@
             ];
         }
 
         return $fileData + [
             'sizes' => $size,
         ];
     }
 
     private function handleSizeAndPurpose(?string $purpose, int $size, array $fileData): array
     {
         $sizes = $size === 0 ? 'any' : $size . 'x' . $size;
         $fileData += [
@@ -243,7 +244,20 @@
         $progressBar = $io->createProgressBar(count($this->config['screenshots']));
         $progressBar->start();
         $io->info('Processing screenshots');
+        $config = [];
         foreach ($this->config['screenshots'] as $screenshot) {
+            $src = $screenshot['src'];
+            if (! $this->filesystem->exists($src)) {
+                continue;
+            }
+            foreach ($this->findImages($src) as $image) {
+                $data = $screenshot;
+                $data['src'] = $image;
+                $config[] = $data;
+            }
+        }
+
+        foreach ($config as $screenshot) {
             $this->processProgressBar($progressBar, 'screenshot', $screenshot['src']);
             $data = $this->loadFileAndConvert($screenshot['src'], null, $screenshot['format'] ?? null);
             if ($data === null) {
@@ -391,4 +405,26 @@
 
         return $manifest;
     }
+
+    /**
+     * @return iterable<string}>
+     */
+    private function findImages(string $src): iterable
+    {
+        $finder = new Finder();
+        if (is_file($src)) {
+            yield $src;
+            return;
+        }
+        $files = $finder->in($src)
+            ->files()
+            ->name('/\.(png|jpg|jpeg|gif|webp|svg)$/i');
+        foreach ($files as $file) {
+            if ($file->isFile()) {
+                yield $file->getRealPath();
+            } else {
+                yield from $this->findImages($file->getRealPath());
+            }
+        }
+    }
 }

tests/config.php

@@ -106,31 +106,10 @@
         'theme_color' => 'red',
         'screenshots' => [
             [
-                'src' => sprintf('%s/images/360x800.svg', __DIR__),
-                'label' => 'Homescreen of Awesome App',
+                'src' => sprintf('%s/images/screenshots', __DIR__),
                 'platform' => 'android',
                 'format' => 'png',
             ],
-            [
-                'src' => sprintf('%s/images/390x844.svg', __DIR__),
-                'label' => 'List of Awesome Resources available in Awesome App',
-                'platform' => 'windows',
-                'format' => 'jpeg',
-            ],
-            [
-                'src' => sprintf('%s/images/600x400.svg', __DIR__),
-                'label' => 'Awesome App in action (1)',
-                'format' => 'webp',
-            ],
-            [
-                'src' => sprintf('%s/images/780x360.svg', __DIR__),
-                'label' => 'Awesome App in action (2)',
-                'format' => 'webp',
-            ],
-            [
-                'src' => sprintf('%s/images/915x412.svg', __DIR__),
-                'label' => 'Awesome App in action (3)',
-            ],
         ],
         'share_target' => [
             'action' => '/shared-content-receiver/',