Fix #76 : Remove restriction on filesystem resources

CHANGELOG.md

@@ -5,6 +5,7 @@ CHANGELOG
 
   * Add Rotate filter.
   * Remove time_start metadata when using synchronize filter
+  * Remove restriction on filesystem resources.
 
 * 0.4.1 (11-26-2013)
 

src/FFMpeg/FFMpeg.php

@@ -14,6 +14,7 @@ namespace FFMpeg;
 use Alchemy\BinaryDriver\ConfigurationInterface;
 use FFMpeg\Driver\FFMpegDriver;
 use FFMpeg\Exception\InvalidArgumentException;
+use FFMpeg\Exception\RuntimeException;
 use FFMpeg\Media\Audio;
 use FFMpeg\Media\Video;
 use Psr\Log\LoggerInterface;
@@ -88,12 +89,10 @@ class FFMpeg
      */
     public function open($pathfile)
     {
-        if (!file_exists($pathfile)) {
-            throw new InvalidArgumentException(sprintf('File %s does not exists', $pathfile));
+        if (null === $streams = $this->ffprobe->streams($pathfile)) {
+            throw new RuntimeException(sprintf('Unable to probe "%s".', $pathfile));
         }
 
-        $streams = $this->ffprobe->streams($pathfile);
-
         if (0 < count($streams->videos())) {
             return new Video($pathfile, $this->driver, $this->ffprobe);
         } elseif (0 < count($streams->audios())) {

src/FFMpeg/Format/ProgressListener/AbstractProgressListener.php

@@ -154,6 +154,10 @@ abstract class AbstractProgressListener extends EventEmitter implements Listener
             $this->initialize();
         }
 
+        if (null === $this->totalSize || null === $this->duration) {
+            return;
+        }
+
         $matches = array();
 
         if (preg_match($this->getPattern(), $progress, $matches) !== 1) {
@@ -226,9 +230,14 @@ abstract class AbstractProgressListener extends EventEmitter implements Listener
 
     private function initialize()
     {
-        $format = $this->ffprobe->format($this->pathfile);
+        try {
+            $format = $this->ffprobe->format($this->pathfile);
+        } catch (RuntimeException $e) {
+            return;
+        }
 
         if (false === $format->has('size') || false === $format->has('duration')) {
+            return;
             throw new RuntimeException(sprintf('Unable to probe format for %s', $this->pathfile));
         }
 

src/FFMpeg/Media/AbstractMediaType.php

@@ -30,8 +30,6 @@ abstract class AbstractMediaType implements MediaTypeInterface
 
     public function __construct($pathfile, FFMpegDriver $driver, FFProbe $ffprobe)
     {
-        $this->ensureFileIsPresent($pathfile);
-
         $this->pathfile = $pathfile;
         $this->driver = $driver;
         $this->ffprobe = $ffprobe;
@@ -106,15 +104,6 @@ abstract class AbstractMediaType implements MediaTypeInterface
         return $this->filters;
     }
 
-    protected function ensureFileIsPresent($filename)
-    {
-        if (!is_file($filename) || !is_readable($filename)) {
-            throw new InvalidArgumentException(sprintf(
-                '%s is not present or not readable', $filename
-            ));
-        }
-    }
-
     protected function cleanupTemporaryFile($filename)
     {
         if (file_exists($filename) && is_writable($filename)) {

tests/FFMpeg/Functional/VideoTranscodeTest.php

@@ -3,6 +3,7 @@
 namespace FFMpeg\Functional;
 
 use FFMpeg\Format\Video\X264;
+use FFMpeg\Media\Video;
 
 class VideoTranscodeTest extends FunctionalTestCase
 {
@@ -35,4 +36,22 @@ class VideoTranscodeTest extends FunctionalTestCase
         $this->assertFileExists($filename);
         unlink($filename);
     }
+
+    /**
+     * @expectedException \FFMpeg\Exception\RuntimeException
+     */
+    public function testTranscodeInvalidFile()
+    {
+        $ffmpeg = $this->getFFMpeg();
+        $ffmpeg->open(__DIR__ . '/../../files/UnknownFileTest.ogv');
+    }
+
+    public function testSaveInvalidForgedVideo()
+    {
+        $ffmpeg = $this->getFFMpeg();
+        $video = new Video(__DIR__ . '/../../files/UnknownFileTest.ogv', $ffmpeg->getFFMpegDriver(), $ffmpeg->getFFProbe());
+
+        $this->setExpectedException('FFMpeg\Exception\RuntimeException');
+        $video->save(new X264('libvo_aacenc'), __DIR__ . '/output/output-x264.mp4');
+    }
 }

tests/FFMpeg/Tests/FFMpegTest.php

@@ -10,7 +10,8 @@ use FFMpeg\FFProbe\DataMapping\Stream;
 class FFMpegTest Extends TestCase
 {
     /**
-     * @expectedException FFMpeg\Exception\InvalidArgumentException
+     * @expectedException \FFMpeg\Exception\RuntimeException
+     * @expectedExceptionMessage Unable to probe "/path/to/unknown/file".
      */
     public function testOpenInvalid()
     {
@@ -58,7 +59,7 @@ class FFMpegTest Extends TestCase
     }
 
     /**
-     * @expectedException FFMpeg\Exception\InvalidArgumentException
+     * @expectedException \FFMpeg\Exception\InvalidArgumentException
      */
     public function testOpenUnknown()
     {

tests/FFMpeg/Tests/Media/AbstractMediaTestCase.php

@@ -6,5 +6,4 @@ use FFMpeg\Tests\TestCase;
 
 abstract class AbstractMediaTestCase extends TestCase
 {
-    abstract public function testWithInvalidFile();
 }

tests/FFMpeg/Tests/Media/AudioTest.php

@@ -9,17 +9,6 @@ use FFMpeg\Format\AudioInterface;
 
 class AudioTest extends AbstractStreamableTestCase
 {
-    /**
-     * @expectedException FFMpeg\Exception\InvalidArgumentException
-     */
-    public function testWithInvalidFile()
-    {
-        $driver = $this->getFFMpegDriverMock();
-        $ffprobe = $this->getFFProbeMock();
-
-        new Audio('/no/file', $driver, $ffprobe);
-    }
-
     public function testFiltersReturnsAudioFilters()
     {
         $driver = $this->getFFMpegDriverMock();

tests/FFMpeg/Tests/Media/FrameTest.php

@@ -6,14 +6,6 @@ use FFMpeg\Media\Frame;
 
 class FrameTest extends AbstractMediaTestCase
 {
-    /**
-     * @expectedException FFMpeg\Exception\InvalidArgumentException
-     */
-    public function testWithInvalidFile()
-    {
-        new Frame($this->getVideoMock('/No/file'), $this->getFFMpegDriverMock(), $this->getFFProbeMock(), $this->getTimeCodeMock());
-    }
-
     public function testGetTimeCode()
     {
         $driver = $this->getFFMpegDriverMock();

tests/FFMpeg/Tests/Media/VideoTest.php

@@ -9,17 +9,6 @@ use FFMpeg\Format\VideoInterface;
 
 class VideoTest extends AbstractStreamableTestCase
 {
-    /**
-     * @expectedException FFMpeg\Exception\InvalidArgumentException
-     */
-    public function testWithInvalidFile()
-    {
-        $driver = $this->getFFMpegDriverMock();
-        $ffprobe = $this->getFFProbeMock();
-
-        new Video('/no/file', $driver, $ffprobe);
-    }
-
     public function testFiltersReturnsVideoFilters()
     {
         $driver = $this->getFFMpegDriverMock();