Integrate graby

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Controller / EntryController.php

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index b6a689633e1f89fd2671193151579bd6186d94df..bd87c6f4431ff88a702d58e3cedbdade7c866adb 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -31,10 +31,14 @@ class EntryController extends Controller
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            $content = Extractor::extract($entry->getUrl());
+            $content = $this->get('wallabag_core.graby')->fetchContent($entry->getUrl());
 
-            $entry->setTitle($content->getTitle());
-            $entry->setContent($content->getBody());
+            $entry->setTitle($content['title']);
+            $entry->setContent($content['html']);
+            $entry->setMimetype($content['content_type']);
+            if (isset($content['open_graph']['og_image'])) {
+                $entry->setPreviewPicture($content['open_graph']['og_image']);
+            }
 
             $em = $this->getDoctrine()->getManager();
             $em->persist($entry);
@@ -101,6 +105,21 @@ class EntryController extends Controller
         ));
     }
 
+    /**
+     * Shows all entries for current user.
+     *
+     * @param Request $request
+     * @param int     $page
+     *
+     * @Route("/all/list/{page}", name="all", defaults={"page" = "1"})
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function showAllAction(Request $request, $page)
+    {
+        return $this->showEntries('all', $request, $page);
+    }
+
     /**
      * Shows unread entries for current user.
      *
@@ -173,6 +192,10 @@ class EntryController extends Controller
                 $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId());
                 break;
 
+            case 'all':
+                $qb = $repository->getBuilderForAllByUser($this->getUser()->getId());
+                break;
+
             default:
                 throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
         }
@@ -273,16 +296,15 @@ class EntryController extends Controller
     }
 
     /**
-     * Deletes entry.
+     * Deletes entry and redirect to the homepage.
      *
-     * @param Request $request
-     * @param Entry   $entry
+     * @param Entry $entry
      *
      * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function deleteEntryAction(Request $request, Entry $entry)
+    public function deleteEntryAction(Entry $entry)
     {
         $this->checkUserAction($entry);
 
@@ -295,7 +317,7 @@ class EntryController extends Controller
             'Entry deleted'
         );
 
-        return $this->redirect($request->headers->get('referer'));
+        return $this->redirect($this->generateUrl('homepage'));
     }
 
     /**