Added option to set path for FFprobe adapter

Author: tmp-hallenser

lib/PHPExif/Adapter/FFprobe.php

@@ -12,6 +12,7 @@
 namespace PHPExif\Adapter;
 
 use PHPExif\Exif;
+use InvalidArgumentException;
 use FFMpeg;
 
 /**
@@ -25,12 +26,62 @@
 class FFprobe extends AdapterAbstract
 {
 
+    const TOOL_NAME = 'ffprobe';
+
+    /**
+     * Path to the exiftool binary
+     *
+     * @var string
+     */
+    protected $toolPath;
+
     /**
      * @var string
      */
     protected $mapperClass = '\\PHPExif\\Mapper\\FFprobe';
 
 
+    /**
+     * Setter for the exiftool binary path
+     *
+     * @param string $path The path to the exiftool binary
+     * @return \PHPExif\Adapter\FFprobe Current instance
+     * @throws \InvalidArgumentException When path is invalid
+     */
+    public function setToolPath($path)
+    {
+        if (!file_exists($path)) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Given path (%1$s) to the ffprobe binary is invalid',
+                    $path
+                )
+            );
+        }
+
+        $this->toolPath = $path;
+
+        return $this;
+    }
+
+
+
+    /**
+     * Getter for the ffprobe binary path
+     * Lazy loads the "default" path
+     *
+     * @return string
+     */
+    public function getToolPath()
+    {
+        if (empty($this->toolPath)) {
+            $path = exec('which ' . self::TOOL_NAME);
+            $this->setToolPath($path);
+        }
+
+        return $this->toolPath;
+    }
+
     /**
      * Reads & parses the EXIF data from given file
      *
@@ -46,8 +97,10 @@ public function getExifFromFile($file)
             return false;
         }
 
+        $ffprobe = FFMpeg\FFProbe::create(array(
+                 'ffprobe.binaries' => $this->getToolPath(),
+             ));
 
-        $ffprobe = FFMpeg\FFProbe::create();
 
         $stream = $ffprobe->streams($file)->videos()->first()->all();
         $format = $ffprobe->format($file)->all();

lib/PHPExif/Mapper/Exiftool.php

@@ -55,7 +55,7 @@ class Exiftool implements MapperInterface
     const GPSLONGITUDE             = 'GPS:GPSLongitude';
     const GPSALTITUDE              = 'GPS:GPSAltitude';
     const IMGDIRECTION             = 'GPS:GPSImgDirection';
-    const DESCRIPTION              = 'IFD0:ImageDescription ';
+    const DESCRIPTION              = 'ExifIFD:ImageDescription ';
     const MAKE                     = 'IFD0:Make';
     const LENS                     = 'ExifIFD:LensModel';
     const SUBJECT                  = 'XMP-dc:Subject';

tests/PHPExif/Adapter/FFprobeTest.php

@@ -14,8 +14,57 @@ public function setUp(): void
         $this->adapter = new \PHPExif\Adapter\FFprobe();
     }
 
+
+    /**
+     * @group ffprobe
+     * @covers \PHPExif\Adapter\FFprobe::getToolPath
+     */
+    public function testGetToolPathFromProperty()
+    {
+        $reflProperty = new \ReflectionProperty('\PHPExif\Adapter\FFprobe', 'toolPath');
+        $reflProperty->setAccessible(true);
+        $expected = '/foo/bar/baz';
+        $reflProperty->setValue($this->adapter, $expected);
+
+        $this->assertEquals($expected, $this->adapter->getToolPath());
+    }
+
+    /**
+     * @group ffprobe
+     * @covers \PHPExif\Adapter\FFprobe::setToolPath
+     */
+    public function testSetToolPathInProperty()
+    {
+        $reflProperty = new \ReflectionProperty('\PHPExif\Adapter\FFprobe', 'toolPath');
+        $reflProperty->setAccessible(true);
+
+        $expected = '/tmp';
+        $this->adapter->setToolPath($expected);
+
+        $this->assertEquals($expected, $reflProperty->getValue($this->adapter));
+    }
+
+    /**
+     * @group ffprobe
+     * @covers \PHPExif\Adapter\FFprobe::setToolPath
+     */
+    public function testSetToolPathThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->adapter->setToolPath('/foo/bar');
+    }
+
+    /**
+     * @group ffprobe
+     * @covers \PHPExif\Adapter\FFprobe::getToolPath
+     */
+    public function testGetToolPathLazyLoadsPath()
+    {
+        $this->assertIsString($this->adapter->getToolPath());
+    }
+
     /**
-     * @group native
+     * @group ffprobe
      * @covers \PHPExif\Adapter\FFprobe::getExifFromFile
      */
     public function testGetExifFromFileHasData()
@@ -34,7 +83,7 @@ public function testGetExifFromFileHasData()
     }
 
     /**
-     * @group native
+     * @group ffprobe
      * @covers \PHPExif\Adapter\FFprobe::getExifFromFile
      */
     public function testErrorImageUsed()