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\NewEntryType;
use Wallabag\CoreBundle\Form\Type\EditEntryType;
use Wallabag\CoreBundle\Filter\EntryFilterType;
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()) {
- $content = Extractor::extract($entry->getUrl());
-
- $entry->setTitle($content->getTitle());
- $entry->setContent($content->getBody());
-
- $em = $this->getDoctrine()->getManager();
- $em->persist($entry);
- $em->flush();
-
+ $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
*
));
}
+ /**
+ * 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.
*
*/
public function showUnreadAction(Request $request, $page)
{
- $form = $this->get('form.factory')->create(new EntryFilterType());
-
- $filterBuilder = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->findUnreadByUser($this->getUser()->getId());
-
- 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, $filterBuilder);
- }
-
- $pagerAdapter = new DoctrineORMAdapter($filterBuilder->getQuery());
- $entries = new Pagerfanta($pagerAdapter);
-
- $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
- $entries->setCurrentPage($page);
-
- return $this->render(
- 'WallabagCoreBundle:Entry:entries.html.twig',
- array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
- )
- );
+ return $this->showEntries('unread', $request, $page);
}
/**
*/
public function showArchiveAction(Request $request, $page)
{
- $form = $this->get('form.factory')->create(new EntryFilterType());
-
- $filterBuilder = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->findArchiveByUser($this->getUser()->getId());
-
- 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, $filterBuilder);
- }
-
- $pagerAdapter = new DoctrineORMAdapter($filterBuilder->getQuery());
- $entries = new Pagerfanta($pagerAdapter);
-
- $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
- $entries->setCurrentPage($page);
-
- return $this->render(
- 'WallabagCoreBundle:Entry:entries.html.twig',
- array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
- )
- );
+ return $this->showEntries('archive', $request, $page);
}
/**
*/
public function showStarredAction(Request $request, $page)
{
- $form = $this->get('form.factory')->create(new EntryFilterType());
+ 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
+ */
+ private function showEntries($type, Request $request, $page)
+ {
+ $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;
- $filterBuilder = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->findStarredByUser($this->getUser()->getId());
+ default:
+ throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
+ }
+
+ $form = $this->get('form.factory')->create(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, $filterBuilder);
+ $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb);
}
- $pagerAdapter = new DoctrineORMAdapter($filterBuilder->getQuery());
+ $pagerAdapter = new DoctrineORMAdapter($qb->getQuery());
$entries = new Pagerfanta($pagerAdapter);
$entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
+ 'form' => $form->createView(),
+ 'entries' => $entries,
+ 'currentPage' => $page,
)
);
}
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry ' . ($entry->isArchived() ? 'archived' : 'unarchived')
+ 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived')
);
return $this->redirect($request->headers->get('referer'));
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry ' . ($entry->isStarred() ? 'starred' : 'unstarred')
+ '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);
'Entry deleted'
);
- return $this->redirect($request->headers->get('referer'));
+ return $this->redirect($this->generateUrl('homepage'));
}
/**
projects / github / wallabag / wallabag.git / blobdiff