Fix windows IC

romainneutron · May 7, 2012 · 279a8e6 · 279a8e6
1 parent 08b4e16
commit 279a8e6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/lib/PHPExiftool/PreviewExtractor.php b/lib/PHPExiftool/PreviewExtractor.php
@@ -24,10 +24,10 @@ public function extract($pathfile, $outputDir)
             throw new Exception\LogicException(sprintf('%s is not writable', $outputDir));
         }
 
-        $command = self::getBinary() . " -if '\$jpgfromraw' -b -jpgfromraw "
-            . "-w " . realpath($outputDir) . "/JpgFromRaw%c.jpg -execute "
-            . "-if '\$previewimage' -b -previewimage "
-            . "-w " . realpath($outputDir) . "/PreviewImage%c.jpg "
+        $command = self::getBinary() . " -if \"\$jpgfromraw\" -b -jpgfromraw "
+            . "-w " . escapeshellarg(realpath($outputDir)) . "/JpgFromRaw%c.jpg -execute "
+            . "-if \"\$previewimage\" -b -previewimage "
+            . "-w " . escapeshellarg(realpath($outputDir)) . "/PreviewImage%c.jpg "
             . "-common_args -q -m " . $pathfile;
 
         try {

diff --git a/tests/lib/PHPExiftool/ReaderTest.php b/tests/lib/PHPExiftool/ReaderTest.php
@@ -9,6 +9,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     protected $object;
     protected static $tmpDir;
+    protected $disableSymLinkTest = false;
 
     public static function setUpBeforeClass()
     {
@@ -41,7 +42,9 @@ public static function setUpBeforeClass()
         file_put_contents($tmpDir2 . '/hello2.world', 'Hello');
 
         if ( ! is_link(self::$tmpDir . '/symlink')) {
-            symlink($tmpDir2, self::$tmpDir . '/symlink');
+            if ( ! @symlink($tmpDir2, self::$tmpDir . '/symlink')) {
+                $this->disableSymLinkTest = true;
+            }
         }
 
         file_put_contents(self::$tmpDir . '/dir/newfile.txt', 'Hello');
@@ -126,8 +129,7 @@ public function testSort()
 
         $results = array();
 
-        foreach($reader->all() as $entity)
-        {
+        foreach ($reader->all() as $entity) {
             $results[] = $entity->getFile()->getFilename();
         }
 
@@ -145,7 +147,7 @@ public function testFiles()
 
         $splfile = $this->object->files(self::$tmpDir . '/hello.exiftool')->first()->getFile();
 
-        $this->assertEquals(realpath($file), $splfile->getPathname());
+        $this->assertEquals(realpath($file), realpath($splfile->getPathname()));
     }
 
     /**
@@ -318,6 +320,10 @@ public function testExtensionsMisUse()
      */
     public function testFollowSymLinks()
     {
+        if ($this->disableSymLinkTest) {
+            $this->markTestSkipped('This system does not support symlinks');
+        }
+
         $reader = new Reader();
         $reader->in(self::$tmpDir)
             ->followSymLinks();

diff --git a/tests/lib/PHPExiftool/WriterTest.php b/tests/lib/PHPExiftool/WriterTest.php
@@ -250,7 +250,7 @@ public function testAddMetadatasArg()
         $writer->setModule(WriterTester::MODULE_MWG, false);
         $this->assertNotContains(' -use MWG', $writer->addMetadatasArgTester($metadatas));
 
-        $this->assertContains(" -XMP-iptcExt:PersonInImage='Nicolas'", $writer->addMetadatasArgTester($metadatas));
+        $this->assertContains("/\ -XMP-iptcExt:PersonInImage=['\"]Nicolas['\"]", $writer->addMetadatasArgTester($metadatas));
     }
 }