Using django paginator instead of manual pagination

boards/models/post.py

@@ -6,6 +6,7 b' import time'
 import math
 import re
 from django.core.cache import cache
+from django.core.paginator import Paginator
 
 from django.db import models
 from django.http import Http404
@@ -126,28 +127,12 b' class PostManager(models.Manager):'
         threads = threads.filter(archived=archived).order_by(order_by)
 
         if page != ALL_PAGES:
-            thread_count = threads.count()
-
-            if page < self._get_page_count(thread_count):
-                start_thread = page * settings.THREADS_PER_PAGE
-                end_thread = min(start_thread + settings.THREADS_PER_PAGE,
-                                 thread_count)
-                threads = threads[start_thread:end_thread]
+            threads = Paginator(threads, settings.THREADS_PER_PAGE).page(
+                    page).object_list
 
         return threads
 
     # TODO Move this method to thread manager
-    def get_thread_page_count(self, tag=None, archived=False):
-        if tag:
-            threads = Thread.objects.filter(tags=tag)
-        else:
-            threads = Thread.objects.all()
-
-        threads = threads.filter(archived=archived)
-
-        return self._get_page_count(threads.count())
-
-    # TODO Move this method to thread manager
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
@@ -180,13 +165,6 b' class PostManager(models.Manager):'
                 referenced_post.last_edit_time = post.pub_time
                 referenced_post.save()
 
-    def _get_page_count(self, thread_count):
-        """
-        Get number of pages that will be needed for all threads
-        """
-
-        return int(math.ceil(thread_count / float(settings.THREADS_PER_PAGE)))
-
     def get_posts_per_day(self):
         """
         Get average count of posts per day for the last 7 days

boards/templates/boards/archive.html

@@ -6,23 +6,23 b''
 {% load static %}
 
 {% block head %}
-    <title>Neboard</title>
+<title>Neboard - {% trans 'Archive' %}</title>
 
-    {% if prev_page %}
-        <link rel="next" href="
+    {% if current_page.has_previous %}
+        <link rel="prev" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
+                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% else %}
-                {% url "index" page=prev_page %}
+                {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
-    {% if next_page %}
+    {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
+                {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% else %}
-                {% url "index" page=next_page %}
+                {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
@@ -34,9 +34,9 b''
     {% get_current_language as LANGUAGE_CODE %}
 
     {% if threads %}
-        {% if prev_page %}
+        {% if current_page.has_previous %}
             <div class="page_link">
-                <a href="{% url "archive" page=prev_page %}">{% trans "Previous page" %}</a>
+                <a href="{% url "archive" page=current_page.previous_page_number %}">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
@@ -111,9 +111,9 b''
         {% endcache %}
         {% endfor %}
 
-        {% if next_page %}
+        {% if current_page.has_next %}
             <div class="page_link">
-                <a href="{% url "archive" page=next_page %}">{% trans "Next page" %}</a>
+                <a href="{% url "archive" page=current_page.next_page_number %}">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
@@ -126,11 +126,11 b''
 {% block metapanel %}
 
     <span class="metapanel">
-        <b><a href="{% url "authors" %}">Neboard</a> 1.5 Aker</b>
+        <b><a href="{% url "authors" %}">Neboard</a> 1.6 Amon</b>
         {% trans "Pages:" %}[
-        {% for page in pages %}
+        {% for page in paginator.page_range %}
             <a
-                {% ifequal page current_page %}
+                {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="

boards/templates/boards/posting_general.html

@@ -12,21 +12,21 b''
         <title>Neboard</title>
     {% endif %}
 
-    {% if prev_page %}
-        <link rel="next" href="
+    {% if current_page.has_previous %}
+        <link rel="prev" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
+                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% else %}
-                {% url "index" page=prev_page %}
+                {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
-    {% if next_page %}
+    {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
+                {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% else %}
-                {% url "index" page=next_page %}
+                {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
@@ -53,13 +53,13 b''
 {% endif %}
 
     {% if threads %}
-        {% if prev_page %}
+        {% if current_page.has_previous %}
             <div class="page_link">
                 <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
+                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% else %}
-                {% url "index" page=prev_page %}
+                {% url "index" page=current_page.previous_page_number %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
@@ -69,9 +69,9 b''
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
             {% if thread.bumpable %}
-		        <div class="post" id="{{ thread.op.id }}">
+                <div class="post" id="{{ thread.op.id }}">
             {% else %}
-		        <div class="post dead_post" id="{{ thread.op.id }}">
+                <div class="post dead_post" id="{{ thread.op.id }}">
             {% endif %}
             {% if thread.op.image %}
                 <div class="image">
@@ -192,13 +192,13 b''
         {% endcache %}
         {% endfor %}
 
-        {% if next_page %}
+        {% if current_page.has_next %}
             <div class="page_link">
                 <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
+                {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% else %}
-                {% url "index" page=next_page %}
+                {% url "index" page=current_page.next_page_number %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
@@ -233,9 +233,9 b''
     <span class="metapanel">
         <b><a href="{% url "authors" %}">Neboard</a> 1.6 Amon</b>
         {% trans "Pages:" %}[
-        {% for page in pages %}
+        {% for page in paginator.page_range %}
             <a
-                {% ifequal page current_page %}
+                {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="

boards/views/__init__.py

@@ -22,13 +22,14 b' from django.utils import timezone'
 from django.db import transaction
 from django.views.decorators.cache import cache_page
 from django.views.i18n import javascript_catalog
+from django.core.paginator import Paginator
 
 from boards import forms
 import boards
 from boards import utils
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm, LoginForm, ModeratorSettingsForm
-from boards.models import Post, Tag, Ban, User
+from boards.models import Post, Tag, Ban, User, Thread
 from boards.models.post import SETTING_MODERATE, REGEX_REPLY
 from boards.models.user import RANK_USER
 from boards import authors
@@ -40,8 +41,10 b" BAN_REASON_SPAM = 'Autoban: spam bot'"
 MODE_GALLERY = 'gallery'
 MODE_NORMAL = 'normal'
 
+DEFAULT_PAGE = 1
 
-def index(request, page=0):
+
+def index(request, page=DEFAULT_PAGE):
     context = _init_default_context(request)
 
     if utils.need_include_captcha(request):
@@ -71,21 +74,16 b' def index(request, page=0):'
     # TODO Make this generic for tag and threads list pages
     context['threads'] = None if len(threads) == 0 else threads
     context['form'] = form
-    context['current_page'] = int(page)
 
-    page_count = Post.objects.get_thread_page_count()
-    context['pages'] = range(page_count) if page_count > 0 else [0]
-    page = int(page)
-    if page < page_count - 1:
-        context['next_page'] = str(page + 1)
-    if page > 0:
-        context['prev_page'] = str(page - 1)
+    paginator = Paginator(Thread.objects.filter(archived=False),
+            neboard.settings.THREADS_PER_PAGE)
+    _get_page_context(paginator, context, page)
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
-def archive(request, page=0):
+def archive(request, page=DEFAULT_PAGE):
     context = _init_default_context(request)
 
     threads = []
@@ -94,15 +92,10 b' def archive(request, page=0):'
         threads.append(_get_template_thread(thread_to_show))
 
     context['threads'] = threads
-    context['current_page'] = int(page)
 
-    page_count = Post.objects.get_thread_page_count(archived=True)
-    context['pages'] = range(page_count) if page_count > 0 else [0]
-    page = int(page)
-    if page < page_count - 1:
-        context['next_page'] = str(page + 1)
-    if page > 0:
-        context['prev_page'] = str(page - 1)
+    paginator = Paginator(Thread.objects.filter(archived=True),
+            neboard.settings.THREADS_PER_PAGE)
+    _get_page_context(paginator, context, page)
 
     return render(request, 'boards/archive.html', context)
 
@@ -158,10 +151,10 b' def _new_post(request, form, opening_pos'
         return redirect(thread, post_id=thread_to_show)
 
 
-def tag(request, tag_name, page=0):
+def tag(request, tag_name, page=DEFAULT_PAGE):
     """
     Get all tag threads. Threads are split in pages, so some page is
-    requested. Default page is 0.
+    requested.
     """
 
     tag = get_object_or_404(Tag, name=tag_name)
@@ -186,15 +179,10 b' def tag(request, tag_name, page=0):'
     context = _init_default_context(request)
     context['threads'] = None if len(threads) == 0 else threads
     context['tag'] = tag
-    context['current_page'] = int(page)
 
-    page_count = Post.objects.get_thread_page_count(tag=tag)
-    context['pages'] = range(page_count)
-    page = int(page)
-    if page < page_count - 1:
-        context['next_page'] = str(page + 1)
-    if page > 0:
-        context['prev_page'] = str(page - 1)
+    paginator = Paginator(Post.objects.get_threads(tag=tag),
+            neboard.settings.THREADS_PER_PAGE)
+    _get_page_context(paginator, context, page)
 
     context['form'] = form
 
@@ -602,3 +590,12 b' def _delete_old_users():'
             tags_count=0).filter(registration_time__lt=old_registration_date):
         if not Post.objects.filter(user=user).exists():
             user.delete()
+
+
+def _get_page_context(paginator, context, page):
+    """
+    Get pagination context variables
+    """
+
+    context['paginator'] = paginator
+    context['current_page'] = paginator.page(int(page))