Merge pull request #17 from wasinger/master

unify output from Native and Exiftool adapters

Author: Miljar

lib/PHPExif/Reader/Adapter/Exiftool.php

@@ -28,14 +28,19 @@
 class Exiftool extends AdapterAbstract
 {
     const TOOL_NAME = 'exiftool';
-    
+
     /**
      * Path to the exiftool binary
      *
      * @var string
      */
     protected $toolPath;
 
+    /**
+     * @var boolean
+     */
+    protected $numeric = true;
+
     /**
      * Setter for the exiftool binary path
      * 
@@ -58,6 +63,14 @@ public function setToolPath($path)
 
         return $this;
     }
+
+    /**
+     * @param boolean $numeric
+     */
+    public function setNumeric($numeric)
+    {
+        $this->numeric = $numeric;
+    }
 
     /**
      * Getter for the exiftool binary path
@@ -86,9 +99,10 @@ public function getExifFromFile($file)
     {
         $result = $this->getCliOutput(
             sprintf(
-                '%1$s -j %2$s',
+                '%1$s%3$s -j %2$s',
                 $this->getToolPath(),
-                $file
+                $file,
+                $this->numeric ? ' -n' : ''
             )
         );
 
@@ -145,30 +159,42 @@ public function mapData(array $source)
             $focalLengthParts = explode(' ', $source['FocalLength']);
             $focalLength = (int) reset($focalLengthParts);
         }
+
+        $exposureTime = false;
+        if (isset($source['ExposureTime'])) {
+            $exposureTime = '1/' . round(1 / $source['ExposureTime']);
+        }
+
+        $caption = false;
+        if (isset($source['Caption'])) {
+            $caption = $source['Caption'];
+        } elseif (isset($source['Caption-Abstract'])) {
+            $caption = $source['Caption-Abstract'];
+        }
 
         return array(
             Exif::APERTURE              => (!isset($source['Aperture'])) ? false : sprintf('f/%01.1f', $source['Aperture']),
-            Exif::AUTHOR                => false,
+            Exif::AUTHOR                => (!isset($source['Artist'])) ? false : $source['Artist'],
             Exif::CAMERA                => (!isset($source['Model'])) ? false : $source['Model'],
-            Exif::CAPTION               => false,
+            Exif::CAPTION               => $caption,
             Exif::COLORSPACE            => (!isset($source[Exif::COLORSPACE]) ? false : $source[Exif::COLORSPACE]),
-            Exif::COPYRIGHT             => false,
+            Exif::COPYRIGHT             => (!isset($source['Copyright'])) ? false : $source['Copyright'],
             Exif::CREATION_DATE         => (!isset($source['CreateDate'])) ? false : DateTime::createFromFormat('Y:m:d H:i:s', $source['CreateDate']),
-            Exif::CREDIT                => false,
-            Exif::EXPOSURE              => (!isset($source['ShutterSpeed'])) ? false : $source['ShutterSpeed'],
-            Exif::FILESIZE              => false,
+            Exif::CREDIT                => (!isset($source['Credit'])) ? false : $source['Credit'],
+            Exif::EXPOSURE              => $exposureTime,
+            Exif::FILESIZE              => (!isset($source[Exif::FILESIZE]) ? false : $source[Exif::FILESIZE]),
             Exif::FOCAL_LENGTH          => $focalLength,
             Exif::FOCAL_DISTANCE        => (!isset($source['ApproximateFocusDistance'])) ? false : sprintf('%1$sm', $source['ApproximateFocusDistance']),
-            Exif::HEADLINE              => false,
+            Exif::HEADLINE              => (!isset($source['Headline'])) ? false : $source['Headline'],
             Exif::HEIGHT                => (!isset($source['ImageHeight'])) ? false : $source['ImageHeight'],
             Exif::HORIZONTAL_RESOLUTION => (!isset($source['XResolution'])) ? false : $source['XResolution'],
             Exif::ISO                   => (!isset($source['ISO'])) ? false : $source['ISO'],
-            Exif::JOB_TITLE             => false,
+            Exif::JOB_TITLE             => (!isset($source['JobTitle'])) ? false : $source['JobTitle'],
             Exif::KEYWORDS              => (!isset($source['Keywords'])) ? false : $source['Keywords'],
-            Exif::MIMETYPE              => false,
+            Exif::MIMETYPE              => (!isset($source['MIMEType'])) ? false : $source['MIMEType'],
             Exif::ORIENTATION           => (!isset($source['Orientation'])) ? false : $source['Orientation'],
             Exif::SOFTWARE              => (!isset($source['Software'])) ? false : $source['Software'],
-            Exif::SOURCE                => false,
+            Exif::SOURCE                => (!isset($source['Source'])) ? false : $source['Source'],
             Exif::TITLE                 => (!isset($source['Title'])) ? false : $source['Title'],
             Exif::VERTICAL_RESOLUTION   => (!isset($source['YResolution'])) ? false : $source['YResolution'],
             Exif::WIDTH                 => (!isset($source['ImageWidth'])) ? false : $source['ImageWidth'],

tests/PHPExif/ExifTest.php

@@ -427,4 +427,33 @@ public function testGetOrientation()
         $this->exif->setRawData($data);
         $this->assertEquals($expected, $this->exif->getOrientation());
     }
+
+    /**
+     * Test that the values returned by both adapters are equal
+     */
+    public function testAdapterConsistency()
+    {
+        $reflClass = new \ReflectionClass('\PHPExif\Exif');
+        $methods = $reflClass->getMethods(ReflectionMethod::IS_PUBLIC);
+        $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg';
+
+        $adapter_exiftool = new \PHPExif\Reader\Adapter\Exiftool();
+        $adapter_native = new \PHPExif\Reader\Adapter\Native();
+
+        $result_exiftool = $adapter_exiftool->getExifFromFile($file);
+        $result_native = $adapter_native->getExifFromFile($file);
+
+        // find all Getter methods on the results and compare its output
+        foreach ($methods as $method) {
+            $name = $method->getName();
+            if (strpos($name, 'get') !== 0 || $name == 'getRawData') {
+                continue;
+            }
+            $this->assertEquals(
+                call_user_func(array($result_native, $name)),
+                call_user_func(array($result_exiftool, $name)),
+                'Adapter difference in method ' . $name
+            );
+        }
+    }
 }