#91 - Support 'directory' as an archive type with rsync as the overwr…

…ite method
brainite · Mar 29, 2017 · 847dc45 · 847dc45
1 parent de669a6
commit 847dc45
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/Configuration/ConfigurationDefaults.php b/src/Configuration/ConfigurationDefaults.php
@@ -123,7 +123,7 @@ public function __construct(&$settings) {
           "flatten" => 1,
         ),
       ),
-      'pdf->(zip/png)' => array(
+      'pdf->(zip/png|directory/png)' => array(
         'imagemagick:default' => array(
           '#engine' => 'Convert\\ImageMagick',
           "colorspace" => "sRGB",

diff --git a/src/Engine/Convert/ImageMagick.php b/src/Engine/Convert/ImageMagick.php
@@ -48,7 +48,7 @@ class ImageMagick extends EngineBase {
   );
 
   public function convertFile($source, $destination) {
-    if (preg_match('@zip/(?<ext>.*)$@s', $this->conversion[1], $arr)) {
+    if (preg_match('@(?:zip|directory)/(?<ext>.*)$@s', $this->conversion[1], $arr)) {
       // Create a temp directory and convert the images.
       $ext = $arr['ext'];
       $imageArchive = new Archive($this);

diff --git a/src/Engine/Helper/Archive.php b/src/Engine/Helper/Archive.php
@@ -59,10 +59,26 @@ public function save($destination) {
           Shell::arg($temp, Shell::SHELL_ARG_BASIC),
           Shell::arg('.', Shell::SHELL_SAFE),
         );
-        echo $this->engine->shell($cmd);
+        $this->engine->shell($cmd);
         rename($temp, $destination);
         break;
 
+      case 'directory':
+        if (!is_dir($destination)) {
+          mkdir($destination);
+          if (!is_dir($destination)) {
+            throw new \ErrorException("Unable to create the destination directory.");
+          }
+        }
+        $cmd = array(
+          $this->engine->shellWhich('rsync'),
+          Shell::arg('a', Shell::SHELL_ARG_BOOL_SGL, TRUE),
+          Shell::arg(rtrim($this->getTempDirectory(), '/') . '/', Shell::SHELL_ARG_BASIC),
+          Shell::arg(rtrim($destination, '/') . '/', Shell::SHELL_ARG_BASIC),
+        );
+        $this->engine->shell($cmd);
+        break;
+
       default:
         throw new \InvalidArgumentException("Invalid archive format spec: $ext");
     }