X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FEntryController.php;h=fa6330314209c36872e1b1b9d2100ea1f05d074c;hb=77b9db87b84e20a6042444e3b18665bc66d4f1f2;hp=b6a689633e1f89fd2671193151579bd6186d94df;hpb=78f66dcc527943e2ebb7e58108e3a5bb257f75b5;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index b6a68963..fa633031 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -2,19 +2,37 @@ namespace Wallabag\CoreBundle\Controller; +use Pagerfanta\Adapter\DoctrineORMAdapter; +use Pagerfanta\Exception\OutOfRangeCurrentPageException; +use Pagerfanta\Pagerfanta; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Wallabag\CoreBundle\Entity\Entry; -use Wallabag\CoreBundle\Service\Extractor; -use Wallabag\CoreBundle\Form\Type\NewEntryType; +use Wallabag\CoreBundle\Form\Type\EntryFilterType; use Wallabag\CoreBundle\Form\Type\EditEntryType; -use Wallabag\CoreBundle\Filter\EntryFilterType; -use Pagerfanta\Adapter\DoctrineORMAdapter; -use Pagerfanta\Pagerfanta; +use Wallabag\CoreBundle\Form\Type\NewEntryType; class EntryController extends Controller { + /** + * @param Entry $entry + */ + private function updateEntry(Entry $entry) + { + try { + $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl()); + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + } catch (\Exception $e) { + return false; + } + + return true; + } + /** * @param Request $request * @@ -26,23 +44,27 @@ class EntryController extends Controller { $entry = new Entry($this->getUser()); - $form = $this->createForm(new NewEntryType(), $entry); + $form = $this->createForm(NewEntryType::class, $entry); $form->handleRequest($request); if ($form->isValid()) { - $content = Extractor::extract($entry->getUrl()); + // check for existing entry, if it exists, redirect to it with a message + $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId()); - $entry->setTitle($content->getTitle()); - $entry->setContent($content->getBody()); + if (false !== $existingEntry) { + $this->get('session')->getFlashBag()->add( + 'notice', + $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y'))) + ); - $em = $this->getDoctrine()->getManager(); - $em->persist($entry); - $em->flush(); + return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); + } + $this->updateEntry($entry); $this->get('session')->getFlashBag()->add( 'notice', - 'Entry saved' + 'flashes.entry.notice.entry_saved' ); return $this->redirect($this->generateUrl('homepage')); @@ -56,11 +78,25 @@ class EntryController extends Controller /** * @param Request $request * + * @Route("/bookmarklet", name="bookmarklet") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function addEntryViaBookmarkletAction(Request $request) + { + $entry = new Entry($this->getUser()); + $entry->setUrl($request->get('url')); + $this->updateEntry($entry); + + return $this->redirect($this->generateUrl('homepage')); + } + + /** * @Route("/new", name="new") * * @return \Symfony\Component\HttpFoundation\Response */ - public function addEntryAction(Request $request) + public function addEntryAction() { return $this->render('WallabagCoreBundle:Entry:new.html.twig'); } @@ -79,7 +115,7 @@ class EntryController extends Controller { $this->checkUserAction($entry); - $form = $this->createForm(new EditEntryType(), $entry); + $form = $this->createForm(EditEntryType::class, $entry); $form->handleRequest($request); @@ -90,7 +126,7 @@ class EntryController extends Controller $this->get('session')->getFlashBag()->add( 'notice', - 'Entry updated' + 'flashes.entry.notice.entry_updated' ); return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); @@ -101,6 +137,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. * @@ -113,6 +164,11 @@ class EntryController extends Controller */ public function showUnreadAction(Request $request, $page) { + // load the quickstart if no entry in database + if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUsername($this->getUser()->getId()) == 0) { + return $this->redirect($this->generateUrl('quickstart')); + } + return $this->showEntries('unread', $request, $page); } @@ -158,7 +214,7 @@ class EntryController extends Controller */ private function showEntries($type, Request $request, $page) { - $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); + $repository = $this->get('wallabag_core.entry_repository'); switch ($type) { case 'starred': @@ -173,11 +229,15 @@ 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)); } - $form = $this->get('form.factory')->create(new EntryFilterType()); + $form = $this->createForm(EntryFilterType::class); if ($request->query->has($form->getName())) { // manually bind values from the request @@ -191,7 +251,13 @@ class EntryController extends Controller $entries = new Pagerfanta($pagerAdapter); $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage()); - $entries->setCurrentPage($page); + try { + $entries->setCurrentPage($page); + } catch (OutOfRangeCurrentPageException $e) { + if ($page > 1) { + return $this->redirect($this->generateUrl($type, array('page' => $entries->getNbPages())), 302); + } + } return $this->render( 'WallabagCoreBundle:Entry:entries.html.twig', @@ -222,6 +288,33 @@ class EntryController extends Controller ); } + /** + * Reload an entry. + * Refetch content from the website and make it readable again. + * + * @param Entry $entry + * + * @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry") + * + * @return \Symfony\Component\HttpFoundation\RedirectResponse + */ + public function reloadAction(Entry $entry) + { + $this->checkUserAction($entry); + + $message = 'flashes.entry.notice.entry_reloaded'; + if (false === $this->updateEntry($entry)) { + $message = 'flashes.entry.notice.entry_reload_failed'; + } + + $this->get('session')->getFlashBag()->add( + 'notice', + $message + ); + + return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + } + /** * Changes read status for an entry. * @@ -239,9 +332,14 @@ class EntryController extends Controller $entry->toggleArchive(); $this->getDoctrine()->getManager()->flush(); + $message = 'flashes.entry.notice.entry_unarchived'; + if ($entry->isArchived()) { + $message = 'flashes.entry.notice.entry_archived'; + } + $this->get('session')->getFlashBag()->add( 'notice', - 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived') + $message ); return $this->redirect($request->headers->get('referer')); @@ -264,19 +362,23 @@ class EntryController extends Controller $entry->toggleStar(); $this->getDoctrine()->getManager()->flush(); + $message = 'flashes.entry.notice.entry_unstarred'; + if ($entry->isStarred()) { + $message = 'flashes.entry.notice.entry_starred'; + } + $this->get('session')->getFlashBag()->add( 'notice', - 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred') + $message ); return $this->redirect($request->headers->get('referer')); } /** - * Deletes entry. + * Deletes entry and redirect to the homepage or the last viewed page. * - * @param Request $request - * @param Entry $entry + * @param Entry $entry * * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry") * @@ -286,16 +388,25 @@ class EntryController extends Controller { $this->checkUserAction($entry); + // generates the view url for this entry to check for redirection later + // to avoid redirecting to the deleted entry. Ugh. + $url = $this->generateUrl( + 'view', + array('id' => $entry->getId()), + UrlGeneratorInterface::ABSOLUTE_URL + ); + $em = $this->getDoctrine()->getManager(); $em->remove($entry); $em->flush(); $this->get('session')->getFlashBag()->add( 'notice', - 'Entry deleted' + 'flashes.entry.notice.entry_deleted' ); - return $this->redirect($request->headers->get('referer')); + // don't redirect user to the deleted entry + return $this->redirect($url !== $request->headers->get('referer') ? $request->headers->get('referer') : $this->generateUrl('homepage')); } /**