Fix sonata-project#232 - Download with x-sendfile not working

Author: rande

Diff for: Filesystem/Local.php

@@ -0,0 +1,21 @@
+<?php
+/*
+ * This file is part of the Sonata project.
+ *
+ * (c) Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\MediaBundle\Filesystem;
+
+use Gaufrette\Adapter\Local as BaseLocal;
+
+class Local extends BaseLocal
+{
+    public function getDirectory()
+    {
+        return $this->directory;
+    }
+}

Diff for: Provider/FileProvider.php

@@ -12,6 +12,7 @@
 namespace Sonata\MediaBundle\Provider;
 
 use Sonata\MediaBundle\Model\MediaInterface;
+use Gaufrette\Adapter\Local;
 use Sonata\MediaBundle\CDN\CDNInterface;
 use Sonata\MediaBundle\Generator\GeneratorInterface;
 use Sonata\MediaBundle\Thumbnail\ThumbnailInterface;
@@ -323,7 +324,14 @@ public function getDownloadResponse(MediaInterface $media, $format, $mode, array
             }, 200, $headers);
         }
 
-        $headers[$mode] = $this->generatePrivateUrl($media, $format);
+        if (!$this->getFilesystem()->getAdapter() instanceof \Sonata\MediaBundle\Filesystem\Local) {
+            throw new \RuntimeException('Cannot use X-Sendfile or X-Accel-Redirect with non \Sonata\MediaBundle\Filesystem\Local');
+        }
+
+        $headers[$mode] = sprintf('%s/%s',
+            $this->getFilesystem()->getAdapter()->getDirectory(),
+            $this->generatePrivateUrl($media, $format)
+        );
 
         return new Response('', 200, $headers);
     }

Diff for: Resources/config/gaufrette.xml

@@ -4,7 +4,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="sonata.media.adapter.filesystem.local" class="Gaufrette\Adapter\Local" />
+        <service id="sonata.media.adapter.filesystem.local" class="Sonata\MediaBundle\Filesystem\Local" />
         <service id="sonata.media.adapter.filesystem.ftp"   class="Gaufrette\Adapter\Ftp" />
         <service id="sonata.media.adapter.service.s3"       class="AmazonS3" >
             <argument type="collection" />

Diff for: Tests/Filesystem/LocalTest.php

@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Sonata package.
+ *
+ * (c) Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\MediaBundle\Tests\Filesystem;
+
+use Sonata\MediaBundle\Filesystem\Local;
+
+class LocalTest extends \PHPUnit_Framework_TestCase
+{
+    public function testReplicate()
+    {
+        $local = new Local('/tmp');
+
+        $this->assertEquals('/tmp', $local->getDirectory());
+    }
+}