From 0c83fd5994861efa728097dd151c994796c39ae1 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 28 Mar 2015 14:27:45 +0100 Subject: Add rss for entries will fix #1000 --- .../CoreBundle/Controller/ConfigController.php | 58 +++++++++++++-- .../CoreBundle/Controller/RssController.php | 84 ++++++++++++++++++++++ 2 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Controller/RssController.php (limited to 'src/Wallabag/CoreBundle/Controller') diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 4e895875..1622f348 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -5,11 +5,14 @@ namespace Wallabag\CoreBundle\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\JsonResponse; use Wallabag\CoreBundle\Entity\Config; use Wallabag\CoreBundle\Entity\User; use Wallabag\CoreBundle\Form\Type\ChangePasswordType; use Wallabag\CoreBundle\Form\Type\UserType; use Wallabag\CoreBundle\Form\Type\NewUserType; +use Wallabag\CoreBundle\Form\Type\RssType; +use Wallabag\CoreBundle\Tools\Utils; class ConfigController extends Controller { @@ -77,6 +80,22 @@ class ConfigController extends Controller return $this->redirect($this->generateUrl('config')); } + // handle rss information + $rssForm = $this->createForm(new RssType(), $config); + $rssForm->handleRequest($request); + + if ($rssForm->isValid()) { + $em->persist($config); + $em->flush(); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'RSS information updated' + ); + + return $this->redirect($this->generateUrl('config')); + } + // handle adding new user $newUser = new User(); $newUserForm = $this->createForm(new NewUserType(), $newUser); @@ -88,6 +107,7 @@ class ConfigController extends Controller $config = new Config($newUser); $config->setTheme($this->container->getParameter('theme')); $config->setItemsPerPage($this->container->getParameter('items_on_page')); + $config->setRssLimit($this->getContainer()->getParameter('rss_limit')); $config->setLanguage($this->container->getParameter('language')); $em->persist($config); @@ -103,13 +123,43 @@ class ConfigController extends Controller } return $this->render('WallabagCoreBundle:Config:index.html.twig', array( - 'configForm' => $configForm->createView(), - 'pwdForm' => $pwdForm->createView(), - 'userForm' => $userForm->createView(), - 'newUserForm' => $newUserForm->createView(), + 'form' => array( + 'config' => $configForm->createView(), + 'rss' => $rssForm->createView(), + 'pwd' => $pwdForm->createView(), + 'user' => $userForm->createView(), + 'new_user' => $newUserForm->createView(), + ), + 'rss' => array( + 'username' => $user->getUsername(), + 'token' => $config->getRssToken(), + ) )); } + /** + * @param Request $request + * + * @Route("/generate-token", name="generate_token") + * + * @return JsonResponse + */ + public function generateTokenAction(Request $request) + { + $config = $this->getConfig(); + $config->setRssToken(Utils::generateToken()); + + $em = $this->getDoctrine()->getManager(); + $em->persist($config); + $em->flush(); + + if ($request->isXmlHttpRequest()) { + return new JsonResponse(array('token' => $config->getRssToken())); + } + + return $request->headers->get('referer') ? $this->redirect($request->headers->get('referer')) : $this->redirectToRoute('config'); + } + /** * Retrieve config for the current user. * If no config were found, create a new one. diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php new file mode 100644 index 00000000..f2f8dd65 --- /dev/null +++ b/src/Wallabag/CoreBundle/Controller/RssController.php @@ -0,0 +1,84 @@ +getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findUnreadByUser( + $user->getId(), + 0, + $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') + ); + + return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( + 'type' => 'unread', + 'entries' => $entries, + )); + } + + /** + * Shows read entries for current user + * + * @Route("/{username}/{token}/archive.xml", name="archive_rss") + * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function showArchiveAction(User $user) + { + $entries = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findArchiveByUser( + $user->getId(), + 0, + $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') + ); + + return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( + 'type' => 'archive', + 'entries' => $entries, + )); + } + + /** + * Shows starred entries for current user + * + * @Route("/{username}/{token}/starred.xml", name="starred_rss") + * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function showStarredAction(User $user) + { + $entries = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findStarredByUser( + $user->getId(), + 0, + $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') + ); + + return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( + 'type' => 'starred', + 'entries' => $entries, + )); + } +} -- cgit v1.2.3 From 371ac69a6bd6325929e4efee7958682a6b1666f7 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 28 Mar 2015 21:43:49 +0100 Subject: Add tests and fix few mistakes --- src/Wallabag/CoreBundle/Controller/ConfigController.php | 2 +- src/Wallabag/CoreBundle/Controller/RssController.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/CoreBundle/Controller') diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 1622f348..dbae3ea7 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -107,7 +107,7 @@ class ConfigController extends Controller $config = new Config($newUser); $config->setTheme($this->container->getParameter('theme')); $config->setItemsPerPage($this->container->getParameter('items_on_page')); - $config->setRssLimit($this->getContainer()->getParameter('rss_limit')); + $config->setRssLimit($this->container->getParameter('rss_limit')); $config->setLanguage($this->container->getParameter('language')); $em->persist($config); diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index f2f8dd65..14f1dcb2 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php @@ -25,7 +25,7 @@ class RssController extends Controller ->findUnreadByUser( $user->getId(), 0, - $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') + $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') ); return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( @@ -49,7 +49,7 @@ class RssController extends Controller ->findArchiveByUser( $user->getId(), 0, - $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') + $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') ); return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( @@ -73,7 +73,7 @@ class RssController extends Controller ->findStarredByUser( $user->getId(), 0, - $user->getConfig()->getRssLimit() ?: $this->getContainer()->getParameter('rss_limit') + $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') ); return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( -- cgit v1.2.3