Merge pull request #16 from mcuadros/master

Method/Native/TarExtractor: handling files in dirs

Author: raulfraile

src/Method/Native/TarExtractor.php

@@ -210,18 +210,22 @@ protected function extractTarFile($filename, $target)
             $name = $fields['name'];
             $type = $fields['type'];
 
+            $location = $target . DIRECTORY_SEPARATOR . $name;
             if (self::TYPE_FILE === $type) {
                 $size = $fields['size'];
                 if (0 === $size) {
                     continue;
                 }
 
+                // create the dir
+                $this->getFilesystem()->mkdir(dirname($location));
+
                 // create the file
-                file_put_contents($target . DIRECTORY_SEPARATOR . $name, $this->readBlockData($fileHandler, $size));
+                file_put_contents($location, $this->readBlockData($fileHandler, $size));
 
                 continue;
             } elseif (self::TYPE_DIRECTORY === $type) {
-                $this->getFilesystem()->mkdir($target . DIRECTORY_SEPARATOR . $name);
+                $this->getFilesystem()->mkdir($location);
             }
         }
 

tests/Method/AbstractMethodTest.php

@@ -79,10 +79,11 @@ public function testAllFormatsSupportedByMethod()
     {
         // check supported formats (ok and invalid data)
         foreach ($this->supportedFormats as $format) {
-            if (file_exists($this->filesPath.'file_ok.' . $format->getExtensions()[0])) {
-                $this->checkSupportedValidFormatUsingMethod($format);
-                $this->checkSupportedInvalidFormatUsingMethod($format);
+            foreach ($this->getOkTestResources($format) as $file) {
+                $this->checkSupportedValidFormatUsingMethod($file, $format);
             }
+
+            $this->checkSupportedInvalidFormatUsingMethod($format);
         }
 
         // check unsupported formats
@@ -91,13 +92,26 @@ public function testAllFormatsSupportedByMethod()
         }
     }
 
-    public function checkSupportedValidFormatUsingMethod(FormatInterface $format)
+    protected function getOkTestResources(FormatInterface $format)
+    {
+        $valid = ['file_ok', 'file_ok_no_dirs'];
+        $ext = $format->getExtensions()[0];
+        $files = [];
+        foreach ($valid as $base) {
+            $filename = $base.'.'.$ext;
+            if (file_exists($this->filesPath.$filename)) {
+                $files[] = $filename;
+            }
+        }
+
+        return $files;
+    }
+
+    public function checkSupportedValidFormatUsingMethod($file, FormatInterface $format)
     {
         $target = $this->getTemporaryPath();
         $this->clearTemporaryPath();
 
-        $file = 'file_ok.' . $format->getExtensions()[0];
-
         $response = $this->extract($file, $target, $format);
 
         $this->assertTrue($response);

tests/Resources/files/file_ok_no_dirs.tar

@@ -0,0 +1,2 @@
+/level2/4.txt|4.txt file
+/level2/level3/5.txt|5.txt file

tests/Resources/files/file_ok_no_dirs.tar.key

@@ -21,4 +21,8 @@ dd if=/dev/urandom of=$FILES_DIR/file_fake.tar bs=1 count=1240
 # tar: regular file
 cd $FILES_DIR/uncompressed
 tar -cvf ../file_ok.tar *
-printf "/1.txt|1.txt file\n/2.txt|2.txt file\n/3.txt|3.txt file\n/level2/4.txt|4.txt file\n/level2/level3/5.txt|5.txt file" > ../file_ok.tar.key
+printf "/1.txt|1.txt file\n/2.txt|2.txt file\n/3.txt|3.txt file\n/level2/4.txt|4.txt file\n/level2/level3/5.txt|5.txt file" > ../file_ok.tar.key
+
+# tar: files in dirs, without dirs
+tar -cvf ../file_ok_no_dirs.tar level2/4.txt level2/level3/5.txt
+printf "/level2/4.txt|4.txt file\n/level2/level3/5.txt|5.txt file" > ../file_ok_no_dirs.tar.key