namespace Wallabag\CoreBundle\Controller;
+use Pagerfanta\Adapter\DoctrineORMAdapter;
+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\EntryType;
+use Wallabag\CoreBundle\Filter\EntryFilterType;
+use Wallabag\CoreBundle\Form\Type\EditEntryType;
+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
*
- * @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(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')
+ ->existByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+
+ if (false !== $existingEntry) {
+ $this->get('session')->getFlashBag()->add(
+ 'notice',
+ 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y')
+ );
- $entry->setTitle($content->getTitle());
- $entry->setContent($content->getBody());
+ return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id'])));
+ }
+ $this->updateEntry($entry);
+ $this->get('session')->getFlashBag()->add(
+ 'notice',
+ 'Entry saved'
+ );
+
+ return $this->redirect($this->generateUrl('homepage'));
+ }
+
+ return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array(
+ 'form' => $form->createView(),
+ ));
+ }
+
+ /**
+ * @param Request $request
+ *
+ * @Route("/bookmarklet", name="bookmarklet")
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function addEntryViaBookmarklet(Request $request)
+ {
+ $entry = new Entry($this->getUser());
+ $entry->setUrl($request->get('url'));
+ $this->updateEntry($entry);
+
+ return $this->redirect($this->generateUrl('homepage'));
+ }
+
+ /**
+ * @param Request $request
+ *
+ * @Route("/new", name="new")
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function addEntryAction(Request $request)
+ {
+ return $this->render('WallabagCoreBundle:Entry:new.html.twig');
+ }
+
+ /**
+ * 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(EditEntryType::class, $entry);
+
+ $form->handleRequest($request);
+
+ if ($form->isValid()) {
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry saved'
+ 'Entry updated'
);
- return $this->redirect($this->generateUrl('homepage'));
+ return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
}
- return $this->render('WallabagCoreBundle:Entry:new.html.twig', array(
+ return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array(
'form' => $form->createView(),
));
}
/**
- * Shows unread entries for current user
+ * Shows all entries for current user.
+ *
+ * @param Request $request
+ * @param int $page
*
- * @Route("/unread", name="unread")
+ * @Route("/all/list/{page}", name="all", defaults={"page" = "1"})
*
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function showUnreadAction()
+ public function showAllAction(Request $request, $page)
{
- // TODO change pagination
- $entries = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->findUnreadByUser($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
+ * Shows read entries for current user.
*
- * @Route("/archive", name="archive")
+ * @param Request $request
+ * @param int $page
+ *
+ * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"})
*
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function showArchiveAction()
+ public function showArchiveAction(Request $request, $page)
{
- // TODO change pagination
- $entries = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->findArchiveByUser($this->getUser()->getId(), 0);
+ return $this->showEntries('archive', $request, $page);
+ }
- return $this->render(
- 'WallabagCoreBundle:Entry:entries.html.twig',
- array('entries' => $entries)
- );
+ /**
+ * Shows starred entries for current user.
+ *
+ * @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);
}
/**
- * Shows starred entries for current user
+ * Global method to retrieve entries depending on the given type
+ * It returns the response to be send.
*
- * @Route("/starred", name="starred")
+ * @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->createForm(new EntryFilterType($repository, $this->getUser()));
+
+ 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,
+ )
);
}
/**
- * Shows entry content
+ * Shows entry content.
*
* @param Entry $entry
*
}
/**
- * Changes read status for an entry
+ * 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 = 'Entry reloaded';
+ if (false === $this->updateEntry($entry)) {
+ $message = 'Failed to reload entry';
+ }
+
+ $this->get('session')->getFlashBag()->add(
+ 'notice',
+ $message
+ );
+
+ return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
+ }
+
+ /**
+ * Changes read status for an entry.
*
* @param Request $request
* @param Entry $entry
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry archived'
+ 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived')
);
return $this->redirect($request->headers->get('referer'));
}
/**
- * Changes favorite status for an entry
+ * Changes favorite status for an entry.
*
* @param Request $request
* @param Entry $entry
$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 or the last viewed page.
*
- * @param Request $request
- * @param Entry $entry
+ * @param Entry $entry
*
* @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
*
{
$this->checkUserAction($entry);
- $entry->setDeleted(1);
- $this->getDoctrine()->getManager()->flush();
+ // 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'
);
- 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'));
}
/**
- * Check if the logged user can manage the given entry
+ * Check if the logged user can manage the given entry.
*
* @param Entry $entry
*/
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.');
}
}
}
projects / github / wallabag / wallabag.git / blobdiff