resolve options one by one ; factorize common code

alchemy-fr · Oct 30, 2024 · 89f555c · 89f555c
1 parent 74d10b3
commit 89f555c
Show file tree

Hide file tree

Showing 7 changed files with 229 additions and 287 deletions.
diff --git a/lib/php/rendition-factory/src/Config/ModuleOptionsResolver.php b/lib/php/rendition-factory/src/Config/ModuleOptionsResolver.php
@@ -10,22 +10,8 @@ public function __construct(private TemplateResolverInterface $templateResolver)
     {
     }
 
-    public function resolveOptions(array $options, array $context): array
+    public function resolveOption(mixed $option, array $context): mixed
     {
-        return $this->compile($options, $context);
-    }
-
-    private function compile(array $options, array $context): array
-    {
-        $r = [];
-        foreach ($options as $k => $o) {
-            if (is_array($o)) {
-                $r[$k] = $this->compile($o, $context);
-            } else {
-                $r[$k] = is_string($o) ? $this->templateResolver->resolve($o, $context) : $o;
-            }
-        }
-
-        return $r;
+        return is_string($option) ? $this->templateResolver->resolve($option, $context) : $option;
     }
 }
diff --git a/lib/php/rendition-factory/src/Transformer/Video/FFMpegHelper.php b/lib/php/rendition-factory/src/Transformer/Video/FFMpegHelper.php
@@ -2,27 +2,46 @@
 
 namespace Alchemy\RenditionFactory\Transformer\Video;
 
-use Alchemy\RenditionFactory\Context\TransformationContextInterface;
-use FFMpeg\FFMpeg;
+use FFMpeg;
 
 class FFMpegHelper
 {
-    public static function createFFMpeg(array $options, TransformationContextInterface $context): FFMpeg
+    public static function createFFMpeg(array $options): FFMpeg\FFMpeg
     {
         $ffmpegOptions = [];
-        if ($timeout = $options['timeout'] ?? 3600) {
-            if (!is_int($timeout)) {
-                throw new \InvalidArgumentException('Invalid timeout');
-            }
-            $ffmpegOptions['timeout'] = $timeout;
+
+        if (!is_int($timeout = $options['timeout'] ?? 3600) || $timeout < 1) {
+            throw new \InvalidArgumentException('Invalid timeout');
         }
-        if ($threads = $options['threads'] ?? null) {
+        $ffmpegOptions['timeout'] = $timeout;
+
+        if ($threads = $options['threads']) {
             if (!is_int($threads) || $threads < 1) {
                 throw new \InvalidArgumentException('Invalid threads count');
             }
             $ffmpegOptions['ffmpeg.threads'] = $threads;
         }
 
-        return FFMpeg::create($ffmpegOptions, $context->getLogger());
+        return FFMpeg\FFMpeg::create($ffmpegOptions, $options['logger'] ?? null);
+    }
+
+    public static function pointAsText(FFMpeg\Coordinate\Point $point): string
+    {
+        return sprintf('(%d, %d)', $point->getX(), $point->getY());
+    }
+
+    public static function dimensionAsText(FFMpeg\Coordinate\Dimension $dimension): string
+    {
+        return sprintf('%d x %d', $dimension->getWidth(), $dimension->getHeight());
+    }
+
+    public static function coordAsText(array $coord): string
+    {
+        $s = [];
+        foreach ($coord as $k => $v) {
+            $s[] = sprintf('%s=%d', $k, $v);
+        }
+
+        return '['.implode(', ', $s).']';
     }
 }