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\Form\Type\NewEntryType;
use Wallabag\CoreBundle\Form\Type\EditEntryType;
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
*
$form->handleRequest($request);
if ($form->isValid()) {
- $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $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());
- $em = $this->getDoctrine()->getManager();
- $em->persist($entry);
- $em->flush();
+ if (false !== $existingEntry) {
+ $this->get('session')->getFlashBag()->add(
+ 'notice',
+ 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y')
+ );
+
+ return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id'])));
+ }
+ $this->updateEntry($entry);
$this->get('session')->getFlashBag()->add(
'notice',
'Entry saved'
));
}
+ /**
+ * @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
*
*/
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':
);
}
+ /**
+ * 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.
*
}
/**
- * Deletes entry and redirect to the homepage.
+ * Deletes entry and redirect to the homepage or the last viewed page.
*
* @param Entry $entry
*
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
- public function deleteEntryAction(Entry $entry)
+ public function deleteEntryAction(Request $request, Entry $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',
+ array('id' => $entry->getId()),
+ UrlGeneratorInterface::ABSOLUTE_URL
+ );
+
$em = $this->getDoctrine()->getManager();
$em->remove($entry);
$em->flush();
'Entry deleted'
);
- return $this->redirect($this->generateUrl('homepage'));
+ // don't redirect user to the deleted entry
+ return $this->redirect($url !== $request->headers->get('referer') ? $request->headers->get('referer') : $this->generateUrl('homepage'));
}
/**