Merge pull request #11 from darinda/fix-issue-9

Fix issue 9

Author: MarioBlazek

bundle/Controller/DownloadController.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace Netgen\Bundle\EnhancedBinaryFileBundle\Controller;
+
+use eZ\Bundle\EzPublishIOBundle\BinaryStreamResponse;
+use eZ\Publish\Core\IO\IOServiceInterface;
+use eZ\Publish\Core\SignalSlot\Repository;
+use Netgen\Bundle\InformationCollectionBundle\Entity\EzInfoCollection;
+use Netgen\Bundle\InformationCollectionBundle\Entity\EzInfoCollectionAttribute;
+use Netgen\Bundle\InformationCollectionBundle\Repository\EzInfoCollectionAttributeRepository;
+use Netgen\Bundle\InformationCollectionBundle\Repository\EzInfoCollectionRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+
+class DownloadController
+{
+    use ControllerTrait;
+
+    private $infocollectionAttributeRepository;
+
+    private $infocollectionRepository;
+
+    private $ioService;
+
+    private $repository;
+
+    public function __construct(
+        EzInfoCollectionAttributeRepository $infocollectionAttributeRepository,
+        EzInfoCollectionRepository $infocollectionRepository,
+        IOServiceInterface $ioService,
+        Repository $repository
+    ) {
+        $this->infocollectionAttributeRepository = $infocollectionAttributeRepository;
+        $this->infocollectionRepository = $infocollectionRepository;
+        $this->ioService = $ioService;
+        $this->repository = $repository;
+    }
+
+    /**
+     * @param int $infocollectionAttributeId
+     *
+     * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentValue
+     * @throws \eZ\Publish\Core\Base\Exceptions\NotFoundException
+     *
+     * @return BinaryStreamResponse
+     */
+    public function downloadCollectedEnhancedEzBinaryFileAction($infocollectionAttributeId)
+    {
+        /** @var EzInfoCollectionAttribute $infocollectionAttribute */
+        $infocollectionAttribute = $this->infocollectionAttributeRepository->find($infocollectionAttributeId);
+
+        if ($infocollectionAttribute === null) {
+            throw new \InvalidArgumentException(
+                "Information collection attribute with id '#{$infocollectionAttributeId}'' could not be found"
+            );
+        }
+
+        /** @var EzInfoCollection $infocollection */
+        $infocollection = $this->infocollectionRepository->find($infocollectionAttribute->getInformationCollectionId());
+
+        $contentId = $infocollection->getContentObjectId();
+        $content = $this->repository->getContentService()->loadContent($contentId);
+
+        if (!$this->repository->getPermissionResolver()->canUser('infocollector', 'read', $content)) {
+            throw new AccessDeniedException('Access denied.');
+        }
+
+        $binaryFileXML = $infocollectionAttribute->getDataText();
+        $doc = new \DOMDocument('1.0', 'utf-8');
+        $doc->loadXML($binaryFileXML);
+
+        $xpath = new \DOMXPath($doc);
+        $filePathNodes = $xpath->evaluate('/binaryfile-info/binaryfile-attributes/Filename');
+        $originalFilenameNodes = $xpath->evaluate('/binaryfile-info/binaryfile-attributes/OriginalFilename');
+        if (!$filePathNodes->length) {
+            throw new \InvalidArgumentException(
+                "Information collection attribute with id '#{$infocollectionAttributeId}'' could not be found"
+            );
+        }
+
+        $filePath = $filePathNodes->item(0)->textContent;
+        $fileName = basename($filePath);
+
+        $originalFilename = $originalFilenameNodes->length ? $originalFilenameNodes->item(0)->textContent : $fileName;
+
+        $binaryFile = $this->ioService->loadBinaryFile('collected' . \DIRECTORY_SEPARATOR . $fileName);
+
+        $response = new BinaryStreamResponse($binaryFile, $this->ioService);
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $originalFilename);
+
+        return $response;
+    }
+}

bundle/DependencyInjection/NetgenEnhancedBinaryFileExtension.php

@@ -47,5 +47,6 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('storage_engines.yml');
         $loader->load('mime.yml');
         $loader->load('information_collection.yml');
+        $loader->load('services.yml');
     }
 }

bundle/FieldHandler/EnhancedBinaryFileHandler.php

@@ -102,7 +102,8 @@ protected function storeBinaryFileToPath(EnhancedBinaryFileValue $value, $storag
     {
         $binaryCreateStruct = $this->IOService
             ->newBinaryCreateStructFromLocalFile($value->inputUri);
-        $binaryCreateStruct->id = $storagePrefix . $value->fileName;
+        $encodedFilename = uniqid();
+        $binaryCreateStruct->id = $storagePrefix . $encodedFilename;
 
         $binaryFile = $this->IOService->createBinaryFile($binaryCreateStruct);
 

bundle/Resources/config/routing.yml

@@ -0,0 +1,5 @@
+netgen_enhancedezbinaryfile.route.download_binary_file:
+    path: /netgen/enhancedezbinaryfile/download/{infocollectionAttributeId}
+    defaults: { _controller: netgen_enhancedezbinaryfile.controller.download:downloadCollectedEnhancedEzBinaryFileAction }
+    methods: [GET]
+

bundle/Resources/config/services.yml

@@ -0,0 +1,9 @@
+services:
+    netgen_enhancedezbinaryfile.controller.download:
+        class: Netgen\Bundle\EnhancedBinaryFileBundle\Controller\DownloadController
+        arguments:
+            - "@netgen_information_collection.repository.ez_info_collection_attribute"
+            - "@netgen_information_collection.repository.ez_info_collection"
+            - "@ezpublish.fieldType.ezbinaryfile.io_service"
+            - "@ezpublish.api.repository"
+

doc/INSTALL.md

@@ -41,3 +41,11 @@ $ php app/console cache:clear
 ```
 
 For more detailed configuration, please check [documentation](DOC.md).
+
+### Include the routing config in your routing.yml
+
+```yml
+_netgen_enhancedezbinaryfile:
+    resource: '@NetgenEnhancedBinaryFileBundle/Resources/config/routing.yml'
+```
+