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) {
+ $this->get('logger')->error('Error while saving an entry', [
+ 'exception' => $e,
+ 'entry' => $entry,
+ ]);
+
+ return false;
+ }
+
+ return true;
+ }
+
/**
* @param Request $request
*
{
$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());
+ $existingEntry = $this->checkIfEntryAlreadyExists($entry);
- $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', ['%date%' => $existingEntry->getCreatedAt()->format('d-m-Y')])
+ );
- $em = $this->getDoctrine()->getManager();
- $em->persist($entry);
- $em->flush();
+ return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()]));
+ }
- $this->get('session')->getFlashBag()->add(
- 'notice',
- 'Entry saved'
- );
+ $message = 'flashes.entry.notice.entry_saved';
+ if (false === $this->updateEntry($entry)) {
+ $message = 'flashes.entry.notice.entry_saved_failed';
+ }
+
+ $this->get('session')->getFlashBag()->add('notice', $message);
return $this->redirect($this->generateUrl('homepage'));
}
- return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array(
+ return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', [
'form' => $form->createView(),
- ));
+ ]);
}
/**
* @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'));
+
+ if (false === $this->checkIfEntryAlreadyExists($entry)) {
+ $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');
}
{
$this->checkUserAction($entry);
- $form = $this->createForm(new EditEntryType(), $entry);
+ $form = $this->createForm(EditEntryType::class, $entry);
$form->handleRequest($request);
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry updated'
+ 'flashes.entry.notice.entry_updated'
);
- return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
+ return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
}
- return $this->render('WallabagCoreBundle:Entry:edit.html.twig', array(
+ return $this->render('WallabagCoreBundle:Entry:edit.html.twig', [
'form' => $form->createView(),
- ));
+ ]);
+ }
+
+ /**
+ * 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);
}
/**
*/
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);
}
*/
private function showEntries($type, Request $request, $page)
{
- $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
+ $repository = $this->get('wallabag_core.entry_repository');
switch ($type) {
case 'starred':
$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
$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, ['page' => $entries->getNbPages()]), 302);
+ }
+ }
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
- array(
+ [
'form' => $form->createView(),
'entries' => $entries,
'currentPage' => $page,
- )
+ ]
);
}
return $this->render(
'WallabagCoreBundle:Entry:entry.html.twig',
- array('entry' => $entry)
+ ['entry' => $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 = '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', ['id' => $entry->getId()]));
}
/**
$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'));
+ $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
+
+ return $this->redirect($redirectUrl);
}
/**
$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'));
+ $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
+
+ return $this->redirect($redirectUrl);
}
/**
- * 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);
+ // generates the view url for this entry to check for redirection later
+ // to avoid redirecting to the deleted entry. Ugh.
+ $url = $this->generateUrl(
+ 'view',
+ ['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
+ $to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null);
+
+ $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);
+
+ return $this->redirect($redirectUrl);
}
/**
throw $this->createAccessDeniedException('You can not access this entry.');
}
}
+
+ /**
+ * Check for existing entry, if it exists, redirect to it with a message.
+ *
+ * @param Entry $entry
+ *
+ * @return Entry|bool
+ */
+ private function checkIfEntryAlreadyExists(Entry $entry)
+ {
+ return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+ }
}
projects / github / wallabag / wallabag.git / blobdiff