devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 10:22:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2263 from wallabag/speed-up-count

Browse Source 
Instead of selecting the whole data, just count it
This commit is contained in:
Jeremy Benoist 2016-09-04 20:07:45 +02:00 committed by GitHub
commit c3b53188d7
3 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Controller/DeveloperController.php
View File

@ -49,7 +49,7 @@ class DeveloperController extends Controller
$this->get('session')->getFlashBag()->add( $this->get('session')->getFlashBag()->add(
'notice', 'notice',
$this->get('translator')->trans('flashes.developer.notice.client_created', array('%name%' => $client->getName())) $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
); );
return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', [ return $this->render('WallabagCoreBundle:Developer:client_parameters.html.twig', [
@ -81,7 +81,7 @@ class DeveloperController extends Controller
$this->get('session')->getFlashBag()->add( $this->get('session')->getFlashBag()->add(
'notice', 'notice',
$this->get('translator')->trans('flashes.developer.notice.client_deleted', array('%name%' => $client->getName())) $this->get('translator')->trans('flashes.developer.notice.client_deleted', ['%name%' => $client->getName()])
); );
return $this->redirect($this->generateUrl('developer')); return $this->redirect($this->generateUrl('developer'));

8
src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
View File

@ -35,16 +35,16 @@
{% set currentRoute = app.request.attributes.get('_route') %} {% set currentRoute = app.request.attributes.get('_route') %}
<li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"> <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}">
<a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }} <span class="numberItems grey-text">{{ unreadEntries }}</span></a> <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }} <span class="numberItems grey-text">{{ count_entries('unread') }}</span></a>
</li> </li>
<li class="bold {% if currentRoute == 'starred' %}active{% endif %}"> <li class="bold {% if currentRoute == 'starred' %}active{% endif %}">
<a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }} <span class="numberItems grey-text">{{ starredEntries }}</span></a> <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }} <span class="numberItems grey-text">{{ count_entries('starred') }}</span></a>
</li> </li>
<li class="bold {% if currentRoute == 'archive' %}active{% endif %}"> <li class="bold {% if currentRoute == 'archive' %}active{% endif %}">
<a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ archivedEntries }}</span></a> <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }} <span class="numberItems grey-text">{{ count_entries('archive') }}</span></a>
</li> </li>
<li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"> <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}">
<a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ allEntries }}</span></a> <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a>
</li> </li>
<li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
<a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a> <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a>

65
src/Wallabag/CoreBundle/Twig/WallabagExtension.php
View File

@ -23,41 +23,66 @@ class WallabagExtension extends \Twig_Extension implements \Twig_Extension_Globa
]; ];
} }
public function getFunctions()
{
return array(
new \Twig_SimpleFunction('count_entries', [$this, 'countEntries']),
);
}
public function removeWww($url) public function removeWww($url)
{ {
return preg_replace('/^www\./i', '', $url); return preg_replace('/^www\./i', '', $url);
} }
public function getGlobals() /**
* Return number of entries depending of the type (unread, archive, starred or all).
*
* @param string $type Type of entries to count
*
* @return int
*/
public function countEntries($type)
{ {
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
if (null === $user || !is_object($user)) { if (null === $user || !is_object($user)) {
return array(); return [];
} }
$unreadEntries = $this->repository->enableCache( switch ($type) {
$this->repository->getBuilderForUnreadByUser($user->getId())->getQuery() case 'starred':
); $qb = $this->repository->getBuilderForStarredByUser($user->getId());
break;
$starredEntries = $this->repository->enableCache( case 'archive':
$this->repository->getBuilderForStarredByUser($user->getId())->getQuery() $qb = $this->repository->getBuilderForArchiveByUser($user->getId());
); break;
$archivedEntries = $this->repository->enableCache( case 'unread':
$this->repository->getBuilderForArchiveByUser($user->getId())->getQuery() $qb = $this->repository->getBuilderForUnreadByUser($user->getId());
); break;
$allEntries = $this->repository->enableCache( case 'all':
$this->repository->getBuilderForAllByUser($user->getId())->getQuery() $qb = $this->repository->getBuilderForAllByUser($user->getId());
); break;
return array( default:
'unreadEntries' => count($unreadEntries->getResult()), throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
'starredEntries' => count($starredEntries->getResult()), }
'archivedEntries' => count($archivedEntries->getResult()),
'allEntries' => count($allEntries->getResult()), // THANKS to PostgreSQL we CAN'T make a DEAD SIMPLE count(e.id)
); // ERROR: column "e0_.id" must appear in the GROUP BY clause or be used in an aggregate function
$query = $qb
->select('e.id')
->groupBy('e.id')
->getQuery();
$data = $this->repository
->enableCache($query)
->getArrayResult();
return count($data);
} }
public function getName() public function getName()