X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FEntryController.php;h=bd87c6f4431ff88a702d58e3cedbdade7c866adb;hb=fad316151c282b2383fae751f7ca45373f1f26ed;hp=7fd982c903e82e66f0789125bedd62ffba616d5e;hpb=2878416f8b4d94fb5e64c2fa61861526a7654d3d;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 7fd982c9..bd87c6f4 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -7,30 +7,38 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Service\Extractor; -use Wallabag\CoreBundle\Form\Type\EntryType; +use Wallabag\CoreBundle\Form\Type\NewEntryType; +use Wallabag\CoreBundle\Form\Type\EditEntryType; +use Wallabag\CoreBundle\Filter\EntryFilterType; +use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Pagerfanta; class EntryController extends Controller { /** * @param Request $request * - * @Route("/new", name="new_entry") + * @Route("/new-entry", name="new_entry") * * @return \Symfony\Component\HttpFoundation\Response */ - public function addEntryAction(Request $request) + public function addEntryFormAction(Request $request) { $entry = new Entry($this->getUser()); - $form = $this->createForm(new EntryType(), $entry); + $form = $this->createForm(new NewEntryType(), $entry); $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); @@ -44,68 +52,177 @@ class EntryController extends Controller return $this->redirect($this->generateUrl('homepage')); } - return $this->render('WallabagCoreBundle:Entry:new.html.twig', array( + return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array( 'form' => $form->createView(), )); } /** - * Shows unread entries for current user. + * @param Request $request * - * @Route("/unread", name="unread") + * @Route("/new", name="new") * * @return \Symfony\Component\HttpFoundation\Response */ - public function showUnreadAction() + public function addEntryAction(Request $request) { - // TODO change pagination - $entries = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->findUnreadByUser($this->getUser()->getId(), 0); + return $this->render('WallabagCoreBundle:Entry:new.html.twig'); + } - return $this->render( - 'WallabagCoreBundle:Entry:entries.html.twig', - array('entries' => $entries) - ); + /** + * Edit an entry content. + * + * @param Request $request + * @param Entry $entry + * + * @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function editEntryAction(Request $request, Entry $entry) + { + $this->checkUserAction($entry); + + $form = $this->createForm(new EditEntryType(), $entry); + + $form->handleRequest($request); + + if ($form->isValid()) { + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'Entry updated' + ); + + return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + } + + return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array( + 'form' => $form->createView(), + )); } /** - * Shows read entries for current user. + * Shows all entries for current user. + * + * @param Request $request + * @param int $page * - * @Route("/archive", name="archive") + * @Route("/all/list/{page}", name="all", defaults={"page" = "1"}) * * @return \Symfony\Component\HttpFoundation\Response */ - public function showArchiveAction() + public function showAllAction(Request $request, $page) { - // TODO change pagination - $entries = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->findArchiveByUser($this->getUser()->getId(), 0); + return $this->showEntries('all', $request, $page); + } - return $this->render( - 'WallabagCoreBundle:Entry:entries.html.twig', - array('entries' => $entries) - ); + /** + * Shows unread entries for current user. + * + * @param Request $request + * @param int $page + * + * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"}) + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function showUnreadAction(Request $request, $page) + { + return $this->showEntries('unread', $request, $page); + } + + /** + * Shows read entries for current user. + * + * @param Request $request + * @param int $page + * + * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"}) + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function showArchiveAction(Request $request, $page) + { + return $this->showEntries('archive', $request, $page); } /** * Shows starred entries for current user. * - * @Route("/starred", name="starred") + * @param Request $request + * @param int $page + * + * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"}) + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function showStarredAction(Request $request, $page) + { + return $this->showEntries('starred', $request, $page); + } + + /** + * Global method to retrieve entries depending on the given type + * It returns the response to be send. + * + * @param string $type Entries type: unread, starred or archive + * @param Request $request + * @param int $page * * @return \Symfony\Component\HttpFoundation\Response */ - public function showStarredAction() + private function showEntries($type, Request $request, $page) { - // TODO change pagination - $entries = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->findStarredByUser($this->getUser()->getId(), 0); + $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); + + switch ($type) { + case 'starred': + $qb = $repository->getBuilderForStarredByUser($this->getUser()->getId()); + break; + + case 'archive': + $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId()); + break; + + case 'unread': + $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)); + } + + $form = $this->get('form.factory')->create(new EntryFilterType()); + + if ($request->query->has($form->getName())) { + // manually bind values from the request + $form->submit($request->query->get($form->getName())); + + // build the query from the given form object + $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb); + } + + $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); + $entries = new Pagerfanta($pagerAdapter); + + $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); + $entries->setCurrentPage($page); return $this->render( 'WallabagCoreBundle:Entry:entries.html.twig', - array('entries' => $entries) + array( + 'form' => $form->createView(), + 'entries' => $entries, + 'currentPage' => $page, + ) ); } @@ -147,7 +264,7 @@ class EntryController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Entry archived' + 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived') ); return $this->redirect($request->headers->get('referer')); @@ -172,23 +289,22 @@ class EntryController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Entry starred' + 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred') ); return $this->redirect($request->headers->get('referer')); } /** - * 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); @@ -201,7 +317,7 @@ class EntryController extends Controller 'Entry deleted' ); - return $this->redirect($request->headers->get('referer')); + return $this->redirect($this->generateUrl('homepage')); } /** @@ -212,7 +328,7 @@ class EntryController extends Controller private function checkUserAction(Entry $entry) { if ($this->getUser()->getId() != $entry->getUser()->getId()) { - throw $this->createAccessDeniedException('You can not use this entry.'); + throw $this->createAccessDeniedException('You can not access this entry.'); } } }