mirror of
https://github.com/wallabag/wallabag.git
synced 2025-10-10 19:32:07 +00:00
Changed RSS to Atom feed and improve paging
This commit is contained in:
Thomas Citharel
Jeremy Benoist
parent
522e37ad27
commit
531c8d0a5c
57 changed files with 635 additions and 564 deletions
|
|
@ -14,7 +14,7 @@ use Wallabag\CoreBundle\Entity\Config;
|
|||
use Wallabag\CoreBundle\Entity\TaggingRule;
|
||||
use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
|
||||
use Wallabag\CoreBundle\Form\Type\ConfigType;
|
||||
use Wallabag\CoreBundle\Form\Type\RssType;
|
||||
use Wallabag\CoreBundle\Form\Type\FeedType;
|
||||
use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
|
||||
use Wallabag\CoreBundle\Form\Type\UserInformationType;
|
||||
use Wallabag\CoreBundle\Tools\Utils;
|
||||
|
|
@ -92,17 +92,17 @@ class ConfigController extends Controller
|
|||
return $this->redirect($this->generateUrl('config') . '#set3');
|
||||
}
|
||||
|
||||
// handle rss information
|
||||
$rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config') . '#set2']);
|
||||
$rssForm->handleRequest($request);
|
||||
// handle feed information
|
||||
$feedForm = $this->createForm(FeedType::class, $config, ['action' => $this->generateUrl('config') . '#set2']);
|
||||
$feedForm->handleRequest($request);
|
||||
|
||||
if ($rssForm->isSubmitted() && $rssForm->isValid()) {
|
||||
if ($feedForm->isSubmitted() && $feedForm->isValid()) {
|
||||
$em->persist($config);
|
||||
$em->flush();
|
||||
|
||||
$this->addFlash(
|
||||
'notice',
|
||||
'flashes.config.notice.rss_updated'
|
||||
'flashes.config.notice.feed_updated'
|
||||
);
|
||||
|
||||
return $this->redirect($this->generateUrl('config') . '#set2');
|
||||
|
|
@ -143,14 +143,14 @@ class ConfigController extends Controller
|
|||
return $this->render('WallabagCoreBundle:Config:index.html.twig', [
|
||||
'form' => [
|
||||
'config' => $configForm->createView(),
|
||||
'rss' => $rssForm->createView(),
|
||||
'feed' => $feedForm->createView(),
|
||||
'pwd' => $pwdForm->createView(),
|
||||
'user' => $userForm->createView(),
|
||||
'new_tagging_rule' => $newTaggingRule->createView(),
|
||||
],
|
||||
'rss' => [
|
||||
'feed' => [
|
||||
'username' => $user->getUsername(),
|
||||
'token' => $config->getRssToken(),
|
||||
'token' => $config->getFeedToken(),
|
||||
],
|
||||
'twofactor_auth' => $this->getParameter('twofactor_auth'),
|
||||
'wallabag_url' => $this->getParameter('domain_name'),
|
||||
|
|
@ -281,19 +281,19 @@ class ConfigController extends Controller
|
|||
public function generateTokenAction(Request $request)
|
||||
{
|
||||
$config = $this->getConfig();
|
||||
$config->setRssToken(Utils::generateToken());
|
||||
$config->setFeedToken(Utils::generateToken());
|
||||
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
$em->persist($config);
|
||||
$em->flush();
|
||||
|
||||
if ($request->isXmlHttpRequest()) {
|
||||
return new JsonResponse(['token' => $config->getRssToken()]);
|
||||
return new JsonResponse(['token' => $config->getFeedToken()]);
|
||||
}
|
||||
|
||||
$this->addFlash(
|
||||
'notice',
|
||||
'flashes.config.notice.rss_token_updated'
|
||||
'flashes.config.notice.feed_token_updated'
|
||||
);
|
||||
|
||||
return $this->redirect($this->generateUrl('config') . '#set2');
|
||||
|
|
|
|||
|
|
@ -15,56 +15,68 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
|||
use Wallabag\CoreBundle\Entity\Tag;
|
||||
use Wallabag\UserBundle\Entity\User;
|
||||
|
||||
class RssController extends Controller
|
||||
class FeedController extends Controller
|
||||
{
|
||||
/**
|
||||
* Shows unread entries for current user.
|
||||
*
|
||||
* @Route("/{username}/{token}/unread.xml", name="unread_rss", defaults={"_format"="xml"})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
|
||||
* @Route("/feed/{username}/{token}/unread/{page}", name="unread_feed", defaults={"page": 1})
|
||||
* @Route("/{username}/{token}/unread.xml", defaults={"page": 1})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
*
|
||||
* @param User $user
|
||||
* @param $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function showUnreadRSSAction(Request $request, User $user)
|
||||
public function showUnreadFeedAction(User $user, $page)
|
||||
{
|
||||
return $this->showEntries('unread', $user, $request->query->get('page', 1));
|
||||
return $this->showEntries('unread', $user, $page);
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows read entries for current user.
|
||||
*
|
||||
* @Route("/{username}/{token}/archive.xml", name="archive_rss", defaults={"_format"="xml"})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
|
||||
* @Route("/feed/{username}/{token}/archive/{page}", name="archive_feed", defaults={"page": 1})
|
||||
* @Route("/{username}/{token}/archive.xml", defaults={"page": 1})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
*
|
||||
* @param User $user
|
||||
* @param $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function showArchiveRSSAction(Request $request, User $user)
|
||||
public function showArchiveFeedAction(User $user, $page)
|
||||
{
|
||||
return $this->showEntries('archive', $user, $request->query->get('page', 1));
|
||||
return $this->showEntries('archive', $user, $page);
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows starred entries for current user.
|
||||
*
|
||||
* @Route("/{username}/{token}/starred.xml", name="starred_rss", defaults={"_format"="xml"})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
|
||||
* @Route("/feed/{username}/{token}/starred/{page}", name="starred_feed", defaults={"page": 1})
|
||||
* @Route("/{username}/{token}/starred.xml", defaults={"page": 1})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
*
|
||||
* @param User $user
|
||||
* @param $page
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function showStarredRSSAction(Request $request, User $user)
|
||||
public function showStarredFeedAction(User $user, $page)
|
||||
{
|
||||
return $this->showEntries('starred', $user, $request->query->get('page', 1));
|
||||
return $this->showEntries('starred', $user, $page);
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows all entries for current user.
|
||||
*
|
||||
* @Route("/{username}/{token}/all.xml", name="all_rss", defaults={"_format"="xml"})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
|
||||
* @Route("/{username}/{token}/all.xml", name="all_feed", defaults={"_format"="xml"})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function showAllRSSAction(Request $request, User $user)
|
||||
public function showAllFeedAction(Request $request, User $user)
|
||||
{
|
||||
return $this->showEntries('all', $user, $request->query->get('page', 1));
|
||||
}
|
||||
|
|
@ -72,21 +84,21 @@ class RssController extends Controller
|
|||
/**
|
||||
* Shows entries associated to a tag for current user.
|
||||
*
|
||||
* @Route("/{username}/{token}/tags/{slug}.xml", name="tag_rss", defaults={"_format"="xml"})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter")
|
||||
* @Route("/{username}/{token}/tags/{slug}.xml", name="tag_feed", defaults={"_format"="xml"})
|
||||
* @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
|
||||
* @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
|
||||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function showTagsAction(Request $request, User $user, Tag $tag)
|
||||
public function showTagsFeedAction(Request $request, User $user, Tag $tag)
|
||||
{
|
||||
$page = $request->query->get('page', 1);
|
||||
|
||||
$url = $this->generateUrl(
|
||||
'tag_rss',
|
||||
'tag_feed',
|
||||
[
|
||||
'username' => $user->getUsername(),
|
||||
'token' => $user->getConfig()->getRssToken(),
|
||||
'token' => $user->getConfig()->getFeedToken(),
|
||||
'slug' => $tag->getSlug(),
|
||||
],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
|
|
@ -119,12 +131,15 @@ class RssController extends Controller
|
|||
return $this->render(
|
||||
'@WallabagCore/themes/common/Entry/entries.xml.twig',
|
||||
[
|
||||
'url_html' => $this->generateUrl('tag_entries', ['slug' => $tag->getSlug()], UrlGeneratorInterface::ABSOLUTE_URL),
|
||||
'type' => 'tag (' . $tag->getLabel() . ')',
|
||||
'type' => 'tag',
|
||||
'url' => $url,
|
||||
'entries' => $entries,
|
||||
'user' => $user->getUsername(),
|
||||
'domainName' => $this->getParameter('domain_name'),
|
||||
'version' => $this->getParameter('wallabag_core.version'),
|
||||
'tag' => $tag->getSlug(),
|
||||
],
|
||||
new Response('', 200, ['Content-Type' => 'application/rss+xml'])
|
||||
new Response('', 200, ['Content-Type' => 'application/atom+xml'])
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -162,14 +177,14 @@ class RssController extends Controller
|
|||
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
|
||||
$entries = new Pagerfanta($pagerAdapter);
|
||||
|
||||
$perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit');
|
||||
$perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.Feed_limit');
|
||||
$entries->setMaxPerPage($perPage);
|
||||
|
||||
$url = $this->generateUrl(
|
||||
$type . '_rss',
|
||||
$type . '_feed',
|
||||
[
|
||||
'username' => $user->getUsername(),
|
||||
'token' => $user->getConfig()->getRssToken(),
|
||||
'token' => $user->getConfig()->getFeedToken(),
|
||||
],
|
||||
UrlGeneratorInterface::ABSOLUTE_URL
|
||||
);
|
||||
|
|
@ -178,19 +193,19 @@ class RssController extends Controller
|
|||
$entries->setCurrentPage((int) $page);
|
||||
} catch (OutOfRangeCurrentPageException $e) {
|
||||
if ($page > 1) {
|
||||
return $this->redirect($url . '?page=' . $entries->getNbPages(), 302);
|
||||
return $this->redirect($url . '/' . $entries->getNbPages());
|
||||
}
|
||||
}
|
||||
|
||||
return $this->render(
|
||||
'@WallabagCore/themes/common/Entry/entries.xml.twig',
|
||||
[
|
||||
'url_html' => $this->generateUrl($type, [], UrlGeneratorInterface::ABSOLUTE_URL),
|
||||
'type' => $type,
|
||||
'url' => $url,
|
||||
'entries' => $entries,
|
||||
],
|
||||
new Response('', 200, ['Content-Type' => 'application/rss+xml'])
|
||||
return $this->render('@WallabagCore/themes/common/Entry/entries.xml.twig', [
|
||||
'type' => $type,
|
||||
'url' => $url,
|
||||
'entries' => $entries,
|
||||
'user' => $user->getUsername(),
|
||||
'domainName' => $this->getParameter('domain_name'),
|
||||
'version' => $this->getParameter('wallabag_core.version'),
|
||||
],
|
||||
new Response('', 200, ['Content-Type' => 'application/atom+xml'])
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue