#86 - Allow wildcards in conversion chain

brainite · Dec 12, 2016 · 209fec5 · 209fec5
1 parent baaa335
commit 209fec5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Configuration/ConfigurationDefaults.php b/src/Configuration/ConfigurationDefaults.php
@@ -150,21 +150,21 @@ public function __construct(&$settings) {
           'chain' => 'rtf->ps->pdf',
         ),
       ),
-      'webp->jpg' => array(
-        'webp->png->jpg' => array(
+      'webp->(jpg|gif|svg|tiff|wmf)' => array(
+        'webp->png->img' => array(
           '#engine' => 'Chain',
-          'chain' => 'webp->png->jpg',
+          'chain' => 'webp->png->*',
         ),
       ),
       'webp->png' => array(
         'webp:default' => array(
           '#engine' => 'Convert\\WebP',
         ),
       ),
-      'jpg->webp' => array(
+      '(jpg|gif|svg|tiff|wmf)->webp' => array(
         'jpg->png->webp' => array(
           '#engine' => 'Chain',
-          'chain' => 'jpg->png->webp',
+          'chain' => '*->png->webp',
         ),
       ),
       'png->webp' => array(

diff --git a/src/Engine/Chain.php b/src/Engine/Chain.php
@@ -14,6 +14,15 @@ class Chain extends EngineBase {
   public function convertFile($source, $destination) {
     $links = explode('->', $this->configuration['chain']);
 
+    // Allow wildcards for the start/end
+    if ($links[0] === '*') {
+      $links[0] = $this->conversion[0];
+    }
+    if ($links[sizeof($links) - 1] === '*') {
+      $links[sizeof($links) - 1] = $this->conversion[1];
+    }
+
+    // Iterate through the chain.
     $s_path = $this->getTempFile(array_shift($links));
     copy($source, $s_path);
     while (!empty($links)) {