#95 - Maintain permissions on all converted/optimized files

Author: stackpr

src/Console/fileconverter.drush.inc

@@ -128,9 +128,6 @@ function drush_fileconverter_convert($source = NULL, $destination = NULL) {
     }
   }
 
-  // Remember the file stats of the source file.
-  $file_stat = NULL;
-
   // Normalize the file paths.
   $fc = FileConverter\FileConverter::factory();
   $stdin = $stdout = FALSE;
@@ -177,9 +174,6 @@ function drush_fileconverter_convert($source = NULL, $destination = NULL) {
         return;
       }
     }
-    else {
-      $file_stat = stat($source);
-    }
   }
   if ($destination{0} !== '/') {
     if ($destination === '-') {
@@ -235,12 +229,6 @@ function drush_fileconverter_convert($source = NULL, $destination = NULL) {
     readfile($destination);
     unlink($destination);
   }
-  elseif (isset($file_stat)) {
-    // Preserve the same owner/mode as the source.
-    chown($destination, $file_stat['uid']);
-    chgrp($destination, $file_stat['gid']);
-    chmod($destination, $file_stat['mode']);
-  }
 }
 
 function drush_fileconverter_list($list_name = NULL) {

src/FileConverter.php

@@ -115,13 +115,26 @@ public function convert($type = 'string', $convert_path = 'null->null', $source
     // Select a converter.
     $engines = $this->getEngines($convert_path);
 
+    // Remember the file stats of the source file.
+    $file_stat = NULL;
+    if ($type === 'file' && is_file($source)) {
+      $file_stat = stat($source);
+    }
+
     // Attempt to convert the file.
     $errors = array();
     foreach ($engines as $engine) {
       try {
         $engine->$convert($source, $destination);
         $this->previous_engines[] = $engine;
         $return();
+
+        // Preserve the same owner/mode as the source.
+        if ($type === 'file' && is_file($destination) && isset($file_stat)) {
+          chown($destination, $file_stat['uid']);
+          chgrp($destination, $file_stat['gid']);
+          chmod($destination, $file_stat['mode']);
+        }
         return $this;
       } catch (\Exception $e) {
         $errors[] = $e->getMessage();
@@ -287,13 +300,7 @@ public function optimizeFile($source = NULL, $destination = NULL, $ext = NULL) {
     if (!isset($destination)) {
       $destination = $source;
     }
-    $engines = $this->getEngines("$ext->$ext");
-    foreach ($engines as $engine) {
-      if ($engine->convertFile($source, $destination)) {
-        return $this;
-      }
-    }
-    return $this;
+    return $this->convert('file', "$ext->$ext", $source, $destination);
   }
 
   public function &setConverter($convert_path = 'null->null', $configuration = 'null:default') {