dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ExecutableNotFoundException

Browse source
This commit is contained in:
Romain Neutron 2013-07-03 14:13:29 +02:00
commit 8e87d243d9
7 changed files with 61 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/FFMpeg/Driver/FFMpegDriver.php
View file

@ -13,6 +13,9 @@ namespace FFMpeg\Driver;
use Alchemy\BinaryDriver\AbstractBinary;
use Alchemy\BinaryDriver\Configuration;
use Alchemy\BinaryDriver\ConfigurationInterface;
use Alchemy\BinaryDriver\Exception\ExecutableNotFoundException as BinaryDriverExecutableNotFound;
use FFMpeg\Exception\ExecutableNotFoundException;
use Psr\Log\LoggerInterface;
class FFMpegDriver extends AbstractBinary
@ -33,8 +36,22 @@ class FFMpegDriver extends AbstractBinary
*
* @return FFMpegDriver
*/
public static function create(LoggerInterface $logger, $configuration)
public static function create(LoggerInterface $logger = null, $configuration = array())
{
return static::load(array('avconv', 'ffmpeg'), $logger, $configuration);
if (!$configuration instanceof ConfigurationInterface) {
$configuration = new Configuration($configuration);
}
$binaries = $configuration->get('ffmpeg.binaries', array('avconv', 'ffmpeg'));
if (!$configuration->has('timeout')) {
$configuration->set('timeout', 300);
}
try {
return static::load($binaries, $logger, $configuration);
} catch (BinaryDriverExecutableNotFound $e) {
throw new ExecutableNotFoundException('Unable to load FFMpeg', $e->getCode(), $e);
}
}
}

8
src/FFMpeg/Driver/FFProbeDriver.php
View file

@ -14,6 +14,8 @@ namespace FFMpeg\Driver;
use Alchemy\BinaryDriver\AbstractBinary;
use Alchemy\BinaryDriver\Configuration;
use Alchemy\BinaryDriver\ConfigurationInterface;
use Alchemy\BinaryDriver\Exception\ExecutableNotFoundException as BinaryDriverExecutableNotFound;
use FFMpeg\Exception\ExecutableNotFoundException;
use Psr\Log\LoggerInterface;
class FFProbeDriver extends AbstractBinary
@ -42,6 +44,10 @@ class FFProbeDriver extends AbstractBinary
$binaries = $configuration->get('ffprobe.binaries', array('avprobe', 'ffprobe'));
return static::load($binaries, $logger, $configuration);
try {
return static::load($binaries, $logger, $configuration);
} catch (BinaryDriverExecutableNotFound $e) {
throw new ExecutableNotFoundException('Unable to load FFProbe', $e->getCode(), $e);
}
}
}