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

Proper command escaping

Browse source
This commit is contained in:
Romain Neutron 2012-10-08 14:20:59 +02:00
commit 70ba5000c1
5 changed files with 96 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/FFMpeg/FFProbe.php
View file

@ -14,6 +14,7 @@ namespace FFMpeg;
use FFMpeg\Exception\InvalidArgumentException;
use FFMpeg\Exception\RuntimeException;
use Symfony\Component\Process\Process;
use Symfony\Component\Process\ProcessBuilder;
/**
* FFProbe driver
@ -38,9 +39,11 @@ class FFProbe extends Binary
throw new InvalidArgumentException($pathfile);
}
$cmd = $this->binary . ' ' . escapeshellarg($pathfile) . ' -show_format';
$builder = ProcessBuilder::create(array(
$this->binary, $pathfile, '-show_format'
));
$output = $this->executeProbe($cmd);
$output = $this->executeProbe($builder->getProcess());
$ret = array();
@ -84,9 +87,11 @@ class FFProbe extends Binary
throw new InvalidArgumentException($pathfile);
}
$cmd = $this->binary . ' ' . escapeshellarg($pathfile) . ' -show_streams';
$builder = ProcessBuilder::create(array(
$this->binary, $pathfile, '-show_streams'
));
$output = explode("\n", $this->executeProbe($cmd));
$output = explode("\n", $this->executeProbe($builder->getProcess()));
$ret = array();
$n = 0;
@ -123,28 +128,26 @@ class FFProbe extends Binary
/**
*
* @param string $command
* @param Process $process
* @return string
* @throws RuntimeException
*/
protected function executeProbe($command)
protected function executeProbe(Process $process)
{
$this->logger->addInfo(sprintf('FFprobe executes command %s', $command));
$this->logger->addInfo(sprintf('FFprobe executes command %s', $process->getCommandline()));
try {
$process = new Process($command);
$process->run();
} catch (\RuntimeException $e) {
$this->logger->addInfo('FFprobe command failed');
throw new RuntimeException(sprintf('Failed to run the given command %s', $command));
throw new RuntimeException(sprintf('Failed to run the given command %s', $process->getCommandline()));
}
if ( ! $process->isSuccessful()) {
$this->logger->addInfo('FFprobe command failed');
throw new RuntimeException(sprintf('Failed to probe %s', $command));
throw new RuntimeException(sprintf('Failed to probe %s', $process->getCommandline()));
}
$this->logger->addInfo('FFprobe command successful');