Merge pull request #22 from dmstr/dev/fix-export-filehandling

Export filehandling fixed

Author: eluhr

src/commands/PrototypeController.php

@@ -33,7 +33,7 @@
 class PrototypeController extends Controller
 {
 
-    public $escapeFileNames = false;
+    public $escapeFileNames = true;
     public $exportPath = '@runtime/export';
 
     /**
@@ -57,17 +57,17 @@ public function actions()
         $actions['export-html'] = [
             'class' => ExportAction::class,
             'modelClass' => Html::class,
-            'extention' => 'html',
+            'extension' => 'html',
         ];
         $actions['export-less'] = [
             'class' => ExportAction::class,
             'modelClass' => Less::class,
-            'extention' => 'less',
+            'extension' => 'less',
         ];
         $actions['export-twig'] = [
             'class' => ExportAction::class,
             'modelClass' => Twig::class,
-            'extention' => 'twig',
+            'extension' => 'twig',
         ];
         return $actions;
     }
@@ -77,7 +77,6 @@ public function actions()
      *
      * Returns path alias if alias defined otherwise return plain path
      * Removes slash from end
-     * Add sub dir with name of extention
      */
     public function getExportPath()
     {

src/commands/actions/ExportAction.php

@@ -31,13 +31,13 @@
  * @author Elias Luhr <[email protected]>
  *
  * @property ActiveRecord modelClass
- * @property  string extention
+ * @property  string extension
  * @property  PrototypeController controller
  */
 class ExportAction extends Action
 {
     public $modelClass;
-    public $extention;
+    public $extension;
 
     private static $availableModelTypes = [
         Html::class,
@@ -53,7 +53,7 @@ class ExportAction extends Action
     protected function run()
     {
 
-        $this->controller->stdout("Exporting {$this->extention} files" . PHP_EOL, Console::FG_BLUE);
+        $this->controller->stdout("Exporting {$this->extension} files" . PHP_EOL, Console::FG_BLUE);
         if (!class_exists($this->modelClass)) {
             $this->controller->stderr("Model class '{$this->modelClass}' does not exist", Console::FG_RED);
             return ExitCode::IOERR;
@@ -83,7 +83,15 @@ protected function run()
                 $fileName = Inflector::slug(str_replace('/','-',$entry->key));
             }
             try {
-                if (file_put_contents($exportPath . DIRECTORY_SEPARATOR . $fileName . '.' . $this->extention, $entry->value) === false) {
+                // check if filename "looks" like a path, if yes, we must create subdirs
+                if ($fileName !== basename($fileName)) {
+                    $subDir = $exportPath . DIRECTORY_SEPARATOR . trim(dirname($fileName), DIRECTORY_SEPARATOR);
+                    if (!FileHelper::createDirectory($subDir)) {
+                        throw new ErrorException("Error while creating sub directory '{$subDir}' for file '{$fileName}'");
+                    }
+                }
+
+                if (file_put_contents($exportPath . DIRECTORY_SEPARATOR . $fileName . '.' . $this->extension, $entry->value) === false) {
                     throw new ErrorException("Error while writing file for key '{$entry->key}'");
                 }
                 $this->controller->stdout('.');