Rework on export

- all export now return a `HttpFoundation\Response`
- return a 404 on unsupported format
- add tests

1 files changed, 35 insertions, 42 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Wallabag/CoreBundle/Controller/ExportController.php
index 123e491a..dd3cb7ca 100644
--- a/src/Wallabag/CoreBundle/Controller/ExportController.php
+++ b/src/Wallabag/CoreBundle/Controller/ExportController.php
@@ -4,62 +4,55 @@ namespace Wallabag\CoreBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Helper\EntriesExport;
 
 class ExportController extends Controller
 {
     /**
-     * Gets all entries for current user.
+     * Gets one entry content.
      *
-     * @Route("/export/{category}.{format}", name="ebook", requirements={
-     *     "_format": "epub|mobi|pdf|json|xml|txt|csv"
-     * })
+     * @param Entry $entry
+     *
+     * @Route("/export/{id}.{format}", requirements={"id" = "\d+"}, name="export_entry")
      */
-    public function getEntriesAction($format, $category)
+    public function downloadEntryAction(Entry $entry, $format)
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
-        switch ($category) {
-            case 'all':
-                $method = 'All';
-                break;
-
-            case 'unread':
-                $method = 'Unread';
-                break;
-
-            case 'starred':
-                $method = 'Starred';
-                break;
-
-            case 'archive':
-                $method = 'Archive';
-                break;
-
-            default:
-                break;
+        try {
+            return $this->get('wallabag_core.helper.entries_export')
+                ->setEntries($entry)
+                ->updateTitle('entry')
+                ->exportAs($format);
+        } catch (\InvalidArgumentException $e) {
+            throw new NotFoundHttpException($e->getMessage());
         }
-
-        $methodBuilder = 'getBuilderFor'.$method.'ByUser';
-        $qb = $repository->$methodBuilder($this->getUser()->getId());
-        $entries = $qb->getQuery()->getResult();
-
-        $export = new EntriesExport($entries);
-        $export->setMethod($method);
-        $export->exportAs($format);
     }
 
     /**
-     * Gets one entry content.
-     *
-     * @param Entry $entry
+     * Export all entries for current user.
      *
-     * @Route("/export/id/{id}.{format}", requirements={"id" = "\d+"}, name="ebook_entry")
+     * @Route("/export/{category}.{format}", name="export_entries", requirements={
+     *     "_format": "epub|mobi|pdf|json|xml|txt|csv",
+     *     "category": "all|unread|starred|archive"
+     * })
      */
-    public function getEntryAction(Entry $entry, $format)
+    public function downloadEntriesAction($format, $category)
     {
-        $export = new EntriesExport(array($entry));
-        $export->setMethod('entry');
-        $export->exportAs($format);
+        $method = ucfirst($category);
+        $methodBuilder = 'getBuilderFor'.$method.'ByUser';
+        $entries = $this->getDoctrine()
+            ->getRepository('WallabagCoreBundle:Entry')
+            ->$methodBuilder($this->getUser()->getId())
+            ->getQuery()
+            ->getResult();
+
+        try {
+            return $this->get('wallabag_core.helper.entries_export')
+                ->setEntries($entries)
+                ->updateTitle($method)
+                ->exportAs($format);
+        } catch (\InvalidArgumentException $e) {
+            throw new NotFoundHttpException($e->getMessage());
+        }
     }
 }