Using django paginator instead of manual pagination

boards/models/post.py

@@ -1,393 +1,371 b''
 from datetime import datetime, timedelta
 from datetime import time as dtime
 import os
 from random import random
 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
 from django.utils import timezone
 from markupfield.fields import MarkupField
 
 from neboard import settings
 from boards import thumbs
 
 MAX_TITLE_LENGTH = 50
 
 APP_LABEL_BOARDS = 'boards'
 
 CACHE_KEY_PPD = 'ppd'
 
 POSTS_PER_DAY_RANGE = range(7)
 
 BAN_REASON_AUTO = 'Auto'
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 50
 
 DEFAULT_MARKUP_TYPE = 'markdown'
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 ALL_PAGES = -1
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
 
 SETTING_MODERATE = "moderate"
 
 REGEX_REPLY = re.compile('>>(\d+)')
 
 
 class PostManager(models.Manager):
 
     def create_post(self, title, text, image=None, thread=None,
                     ip=NO_IP, tags=None, user=None):
         """
         Create new post
         """
 
         posting_time = timezone.now()
         if not thread:
             thread = Thread.objects.create(bump_time=posting_time,
                                            last_edit_time=posting_time)
         else:
             thread.bump()
             thread.last_edit_time = posting_time
             thread.save()
 
         post = self.create(title=title,
                            text=text,
                            pub_time=posting_time,
                            thread_new=thread,
                            image=image,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,  # TODO Get UA at
                            # last!
                            last_edit_time=posting_time,
                            user=user)
 
         thread.replies.add(post)
         if tags:
             linked_tags = []
             for tag in tags:
                 tag_linked_tags = tag.get_linked_tags()
                 if len(tag_linked_tags) > 0:
                     linked_tags.extend(tag_linked_tags)
 
             tags.extend(linked_tags)
             map(thread.add_tag, tags)
 
         self._delete_old_threads()
         self.connect_replies(post)
 
         return post
 
     def delete_post(self, post):
         """
         Delete post and update or delete its thread
         """
         
         thread = post.thread_new
 
         if thread.get_opening_post() == self:
             thread.replies.delete()
 
             thread.delete()
         else:
             thread.last_edit_time = timezone.now()
             thread.save()
 
             post.delete()
 
     def delete_posts_by_ip(self, ip):
         """
         Delete all posts of the author with same IP
         """
 
         posts = self.filter(poster_ip=ip)
         map(self.delete_post, posts)
 
     # TODO Move this method to thread manager
     def get_threads(self, tag=None, page=ALL_PAGES,
                     order_by='-bump_time', archived=False):
         if tag:
             threads = tag.threads
 
             if not threads.exists():
                 raise Http404
         else:
             threads = Thread.objects.all()
 
         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,
         archive the old ones.
         """
 
         threads = self.get_threads()
         thread_count = threads.count()
 
         if thread_count > settings.MAX_THREAD_COUNT:
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[thread_count - num_threads_to_delete:]
 
             for thread in old_threads:
                 thread.archived = True
                 thread.last_edit_time = timezone.now()
                 thread.save()
 
     def connect_replies(self, post):
         """
         Connect replies to a post to show them as a reflink map
         """
 
         for reply_number in re.finditer(REGEX_REPLY, post.text.raw):
             post_id = reply_number.group(1)
             ref_post = self.filter(id=post_id)
             if ref_post.count() > 0:
                 referenced_post = ref_post[0]
                 referenced_post.referenced_posts.add(post)
                 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
         """
 
         today = datetime.now().date()
         ppd = cache.get(CACHE_KEY_PPD + str(today))
         if ppd:
             return ppd
 
         posts_per_days = []
         for i in POSTS_PER_DAY_RANGE:
             day_end = today - timedelta(i + 1)
             day_start = today - timedelta(i + 2)
 
             day_time_start = timezone.make_aware(datetime.combine(day_start,
                 dtime()), timezone.get_current_timezone())
             day_time_end = timezone.make_aware(datetime.combine(day_end,
                 dtime()), timezone.get_current_timezone())
 
             posts_per_days.append(float(self.filter(
                 pub_time__lte=day_time_end,
                 pub_time__gte=day_time_start).count()))
 
         ppd = (sum(posts_per_day for posts_per_day in posts_per_days) /
                len(posts_per_days))
         cache.set(CACHE_KEY_PPD, ppd)
         return ppd
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     class Meta:
         app_label = APP_LABEL_BOARDS
 
     # TODO Save original file name to some field
     def _update_image_filename(self, filename):
         """Get unique image filename"""
 
         path = IMAGES_DIRECTORY
         new_name = str(int(time.mktime(time.gmtime())))
         new_name += str(int(random() * 1000))
         new_name += FILE_EXTENSION_DELIMITER
         new_name += filename.split(FILE_EXTENSION_DELIMITER)[-1:][0]
 
         return os.path.join(path, new_name)
 
     title = models.CharField(max_length=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE,
                        escape_html=False)
 
     image_width = models.IntegerField(default=0)
     image_height = models.IntegerField(default=0)
 
     image_pre_width = models.IntegerField(default=0)
     image_pre_height = models.IntegerField(default=0)
 
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=(IMAGE_THUMB_SIZE,),
                                         width_field='image_width',
                                         height_field='image_height',
                                         preview_width_field='image_pre_width',
                                         preview_height_field='image_pre_height')
 
     poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
 
     thread = models.ForeignKey('Post', null=True, default=None)
     thread_new = models.ForeignKey('Thread', null=True, default=None)
     last_edit_time = models.DateTimeField()
     user = models.ForeignKey('User', null=True, default=None)
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
                                               blank=True, related_name='rfp+')
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + self.title + ' (' + \
                self.text.raw[:50] + ')'
 
     def get_title(self):
         title = self.title
         if len(title) == 0:
             title = self.text.rendered[:MAX_TITLE_LENGTH]
 
         return title
 
     def get_sorted_referenced_posts(self):
         return self.referenced_posts.order_by('id')
 
     def is_referenced(self):
         return self.referenced_posts.all().exists()
 
     def is_opening(self):
         return self.thread_new.get_replies()[0] == self
 
 
 class Thread(models.Model):
 
     class Meta:
         app_label = APP_LABEL_BOARDS
 
     tags = models.ManyToManyField('Tag')
     bump_time = models.DateTimeField()
     last_edit_time = models.DateTimeField()
     replies = models.ManyToManyField('Post', symmetrical=False, null=True,
                                      blank=True, related_name='tre+')
     archived = models.BooleanField(default=False)
 
     def get_tags(self):
         """
         Get a sorted tag list
         """
 
         return self.tags.order_by('name')
 
     def bump(self):
         """
         Bump (move to up) thread
         """
 
         if self.can_bump():
             self.bump_time = timezone.now()
 
     def get_reply_count(self):
         return self.replies.count()
 
     def get_images_count(self):
         return self.replies.filter(image_width__gt=0).count()
 
     def can_bump(self):
         """
         Check if the thread can be bumped by replying
         """
 
         if self.archived:
             return False
 
         post_count = self.get_reply_count()
 
         return post_count < settings.MAX_POSTS_PER_THREAD
 
     def delete_with_posts(self):
         """
         Completely delete thread and all its posts
         """
 
         if self.replies.count() > 0:
             self.replies.all().delete()
 
         self.delete()
 
     def get_last_replies(self):
         """
         Get last replies, not including opening post
         """
 
         if settings.LAST_REPLIES_COUNT > 0:
             reply_count = self.get_reply_count()
 
             if reply_count > 0:
                 reply_count_to_show = min(settings.LAST_REPLIES_COUNT,
                                           reply_count - 1)
                 last_replies = self.replies.all().order_by('pub_time')[
                                reply_count - reply_count_to_show:]
 
                 return last_replies
 
     def get_replies(self):
         """
         Get sorted thread posts
         """
 
         return self.replies.all().order_by('pub_time')
 
     def add_tag(self, tag):
         """
         Connect thread to a tag and tag to a thread
         """
 
         self.tags.add(tag)
         tag.threads.add(self)
 
     def get_opening_post(self):
         """
         Get first post of the thread
         """
 
         return self.get_replies()[0]
 
     def __unicode__(self):
         return str(self.get_replies()[0].id)
 
     def get_pub_time(self):
         """
         Thread does not have its own pub time, so we need to get it from
         the opening post
         """
 
         return self.get_opening_post().pub_time

boards/templates/boards/archive.html

@@ -1,145 +1,145 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% 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 %}
 
 {% endblock %}
 
 {% block content %}
 
     {% 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 %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
             <div class="post archive_post" id="{{ thread.op.id }}">
             {% if thread.op.image %}
                 <div class="image">
                     <a class="thumb"
                        href="{{ thread.op.image.url }}"><img
                             src="{{ thread.op.image.url_200x150 }}"
                             alt="{{ thread.op.id }}"
                             width="{{ thread.op.image_pre_width }}"
                             height="{{ thread.op.image_pre_height }}"
                             data-width="{{ thread.op.image_width }}"
                             data-height="{{ thread.op.image_height }}"/>
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.op.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.op.id %}"
                     > ({{ thread.op.id }})</a>
                     [{{ thread.op.pub_time }}] — [{{ thread.thread.last_edit_time }}]
 
                     [<a class="link" href="
                     {% url 'thread' thread.op.id %}">{% trans "Open" %}</a>]
 
                     {% if moderator %}
                         <span class="moderator_info">
                             [<a href="
                             {% url 'delete' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Delete' %}</a>]
                             ({{ thread.op.poster_ip }})
                             [<a href="
                             {% url 'ban' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.op.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
 		{% if thread.op.is_referenced %}
 		    <div class="refmap">
 			{% trans "Replies" %}:
 			{% for ref_post in thread.op.get_sorted_referenced_posts %}
 			<a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                     >{% if not forloop.last %},{% endif %}
 			{% endfor %}
 		    </div>
 		{% endif %}
             </div>
             <div class="metadata">
                 {{ thread.thread.get_images_count }} {% trans 'images' %},
                 {{ thread.thread.get_reply_count }} {% trans 'replies' %}.
                 {% if thread.thread.tags %}
                     <span class="tags">
                         {% for tag in thread.thread.get_tags %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
                                 #{{ tag.name }}</a
                                     >{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
             </div>
         </div>
         {% 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 %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
 {% endblock %}
 
 {% 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="
                 {% url "archive" page=page %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/templates/boards/posting_general.html

@@ -1,254 +1,254 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% load static %}
 
 {% block head %}
     {% if tag %}
         <title>Neboard - {{ tag.name }}</title>
     {% else %}
         <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 %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>
             {% if tag in user.fav_tags.all %}
                 <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
                    class="fav">★</a>
             {% else %}
                 <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
                    class="not_fav">★</a>
             {% endif %}
             #{{ tag.name }}
         </h2>
     </div>
 {% 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>
         {% endif %}
 
         {% for thread in threads %}
             {% 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">
                     <a class="thumb"
                        href="{{ thread.op.image.url }}"><img
                             src="{{ thread.op.image.url_200x150 }}"
                             alt="{{ thread.op.id }}"
                             width="{{ thread.op.image_pre_width }}"
                             height="{{ thread.op.image_pre_height }}"
                             data-width="{{ thread.op.image_width }}"
                             data-height="{{ thread.op.image_height }}"/>
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.op.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.op.id %}"
                     > ({{ thread.op.id }})</a>
                     [{{ thread.op.pub_time }}]
                     [<a class="link" href="
                     {% url 'thread' thread.op.id %}#form"
                         >{% trans "Reply" %}</a>]
 
                     {% if moderator %}
                         <span class="moderator_info">
                             [<a href="
                             {% url 'delete' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Delete' %}</a>]
                             ({{ thread.op.poster_ip }})
                             [<a href="
                             {% url 'ban' post_id=thread.op.id %}?next={{ request.path }}"
                                 >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.op.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
 		{% if thread.op.is_referenced %}
 		    <div class="refmap">
 			{% trans "Replies" %}:
 			{% for ref_post in thread.op.get_sorted_referenced_posts %}
 			<a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                     >{% if not forloop.last %},{% endif %}
 			{% endfor %}
 		    </div>
 		{% endif %}
             </div>
             <div class="metadata">
                 {{ thread.thread.get_images_count }} {% trans 'images' %}.
                 {% if thread.thread.tags %}
                     <span class="tags">
                         {% for tag in thread.thread.get_tags %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
                                 #{{ tag.name }}</a
                                     >{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
             </div>
             {% if thread.last_replies.exists %}
                 {% if thread.skipped_replies %}
                     <div class="skipped_replies">
                         <a href="{% url 'thread' thread.op.id %}">
                         {% blocktrans with count=thread.skipped_replies %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                         </a>
                     </div>
                 {% endif %}
                 <div class="last-replies">
                     {% for post in thread.last_replies %}
                         {% if thread.bumpable %}
                             <div class="post" id="{{ post.id }}">
                         {% else %}
                             <div class="post dead_post" id="{{ post.id }}">
                         {% endif %}
                             {% if post.image %}
                                 <div class="image">
                                     <a class="thumb"
                                        href="{{ post.image.url }}"><img
                                             src=" {{ post.image.url_200x150 }}"
                                             alt="{{ post.id }}"
                                             width="{{ post.image_pre_width }}"
                                             height="{{ post.image_pre_height }}"
                                             data-width="{{ post.image_width }}"
                                             data-height="{{ post.image_height }}"/>
                                     </a>
                                 </div>
                             {% endif %}
                             <div class="message">
                                 <div class="post-info">
                                     <span class="title">{{ post.title }}</span>
                                     <a class="post_id" href="
                                 {% url 'thread' thread.op.id %}#{{ post.id }}">
                                         ({{ post.id }})</a>
                                     [{{ post.pub_time }}]
                                 </div>
                                 {% autoescape off %}
                                     {{ post.text.rendered|truncatewords_html:50 }}
                                 {% endautoescape %}
                         </div>
                     {% if post.is_referenced %}
                         <div class="refmap">
                             {% trans "Replies" %}:
                             {% for ref_post in post.get_sorted_referenced_posts %}
                                 <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                                         >{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         </div>
                     {% endif %}
                         </div>
                     {% endfor %}
                 </div>
             {% endif %}
         </div>
         {% 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>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="post-form">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <form enctype="multipart/form-data" method="post">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                 </div>
             </form>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <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="
             {% if tag %}
                 {% url "tag" tag_name=tag page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/views/__init__.py

@@ -1,604 +1,601 b''
 from datetime import datetime, timedelta
 
 from django.db.models import Count
 
 
 OLD_USER_AGE_DAYS = 90
 
 __author__ = 'neko259'
 
 import hashlib
 import string
 import time
 import re
 
 from django.core import serializers
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, Http404
 from django.http.response import HttpResponse
 from django.template import RequestContext
 from django.shortcuts import render, redirect, get_object_or_404
 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
 from boards.utils import get_client_ip
 import neboard
 
 
 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):
         threadFormClass = ThreadCaptchaForm
         kwargs = {'request': request}
     else:
         threadFormClass = ThreadForm
         kwargs = {}
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
                                error_class=PlainErrorList, **kwargs)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = threadFormClass(error_class=PlainErrorList, **kwargs)
 
     threads = []
     for thread_to_show in Post.objects.get_threads(page=int(page)):
         threads.append(_get_template_thread(thread_to_show))
 
     # 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 = []
     for thread_to_show in Post.objects.get_threads(page=int(page),
                                                    archived=True):
         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)
 
 
 @transaction.atomic
 def _new_post(request, form, opening_post=None):
     """Add a new post (in thread or as a reply)."""
 
     ip = get_client_ip(request)
     is_banned = Ban.objects.filter(ip=ip).exists()
 
     if is_banned:
         return redirect(you_are_banned)
 
     data = form.cleaned_data
 
     title = data['title']
     text = data['text']
 
     text = _remove_invalid_links(text)
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     tags = []
 
     if not opening_post:
         tag_strings = data['tags']
 
         if tag_strings:
             tag_strings = tag_strings.split(' ')
             for tag_name in tag_strings:
                 tag_name = string.lower(tag_name.strip())
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
         post_thread = None
     else:
         post_thread = opening_post.thread_new
 
     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                     thread=post_thread, image=image,
                                     tags=tags, user=_get_user(request))
 
     thread_to_show = (opening_post.id if opening_post else post.id)
 
     if opening_post:
         return redirect(reverse(thread, kwargs={'post_id': thread_to_show}) +
                         '#' + str(post.id))
     else:
         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)
     threads = []
     for thread_to_show in Post.objects.get_threads(page=int(page), tag=tag):
         threads.append(_get_template_thread(thread_to_show))
 
     if request.method == 'POST':
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = forms.ThreadForm(initial={'tags': tag_name},
                                 error_class=PlainErrorList)
 
     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
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def thread(request, post_id, mode=MODE_NORMAL):
     """Get all thread posts"""
 
     if utils.need_include_captcha(request):
         postFormClass = PostCaptchaForm
         kwargs = {'request': request}
     else:
         postFormClass = PostForm
         kwargs = {}
 
     opening_post = get_object_or_404(Post, id=post_id)
 
     # If this is not OP, don't show it as it is
     if not opening_post.is_opening():
         raise Http404
 
     if request.method == 'POST' and not opening_post.thread_new.archived:
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList, **kwargs)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form, opening_post)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = postFormClass(error_class=PlainErrorList, **kwargs)
 
     thread_to_show = opening_post.thread_new
 
     context = _init_default_context(request)
 
     posts = thread_to_show.get_replies()
     context['form'] = form
     context["last_update"] = _datetime_to_epoch(thread_to_show.last_edit_time)
     context["thread"] = thread_to_show
 
     if MODE_NORMAL == mode:
         context['bumpable'] = thread_to_show.can_bump()
         if context['bumpable']:
             context['posts_left'] = neboard.settings.MAX_POSTS_PER_THREAD - posts \
                 .count()
             context['bumplimit_progress'] = str(
                 float(context['posts_left']) /
                 neboard.settings.MAX_POSTS_PER_THREAD * 100)
 
         context['posts'] = posts
 
         document = 'boards/thread.html'
     elif MODE_GALLERY == mode:
         context['posts'] = posts.filter(image_width__gt=0)
 
         document = 'boards/thread_gallery.html'
     else:
         raise Http404
 
     return render(request, document, context)
 
 
 def login(request):
     """Log in with user id"""
 
     context = _init_default_context(request)
 
     if request.method == 'POST':
         form = LoginForm(request.POST, request.FILES,
                          error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             user = User.objects.get(user_id=form.cleaned_data['user_id'])
             request.session['user_id'] = user.id
             return redirect(index)
 
     else:
         form = LoginForm()
 
     context['form'] = form
 
     return render(request, 'boards/login.html', context)
 
 
 def settings(request):
     """User's settings"""
 
     context = _init_default_context(request)
     user = _get_user(request)
     is_moderator = user.is_moderator()
 
     if request.method == 'POST':
         with transaction.atomic():
             if is_moderator:
                 form = ModeratorSettingsForm(request.POST,
                                              error_class=PlainErrorList)
             else:
                 form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data['theme']
 
                 user.save_setting('theme', selected_theme)
 
                 if is_moderator:
                     moderate = form.cleaned_data['moderate']
                     user.save_setting(SETTING_MODERATE, moderate)
 
             return redirect(settings)
     else:
         selected_theme = _get_theme(request)
 
         if is_moderator:
             form = ModeratorSettingsForm(initial={'theme': selected_theme,
                                                   'moderate': context['moderator']},
                                          error_class=PlainErrorList)
         else:
             form = SettingsForm(initial={'theme': selected_theme},
                                 error_class=PlainErrorList)
 
     context['form'] = form
 
     return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
     """All tags list"""
 
     context = _init_default_context(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
     return render(request, 'boards/tags.html', context)
 
 
 def jump_to_post(request, post_id):
     """Determine thread in which the requested post is and open it's page"""
 
     post = get_object_or_404(Post, id=post_id)
 
     if not post.thread:
         return redirect(thread, post_id=post.id)
     else:
         return redirect(reverse(thread, kwargs={'post_id': post.thread.id})
                         + '#' + str(post.id))
 
 
 def authors(request):
     """Show authors list"""
 
     context = _init_default_context(request)
     context['authors'] = boards.authors.authors
 
     return render(request, 'boards/authors.html', context)
 
 
 @transaction.atomic
 def delete(request, post_id):
     """Delete post"""
 
     user = _get_user(request)
     post = get_object_or_404(Post, id=post_id)
 
     if user.is_moderator():
         # TODO Show confirmation page before deletion
         Post.objects.delete_post(post)
 
     if not post.thread:
         return _redirect_to_next(request)
     else:
         return redirect(thread, post_id=post.thread.id)
 
 
 @transaction.atomic
 def ban(request, post_id):
     """Ban user"""
 
     user = _get_user(request)
     post = get_object_or_404(Post, id=post_id)
 
     if user.is_moderator():
         # TODO Show confirmation page before ban
         ban, created = Ban.objects.get_or_create(ip=post.poster_ip)
         if created:
             ban.reason = 'Banned for post ' + str(post_id)
             ban.save()
 
     return _redirect_to_next(request)
 
 
 def you_are_banned(request):
     """Show the page that notifies that user is banned"""
 
     context = _init_default_context(request)
 
     ban = get_object_or_404(Ban, ip=utils.get_client_ip(request))
     context['ban_reason'] = ban.reason
     return render(request, 'boards/staticpages/banned.html', context)
 
 
 def page_404(request):
     """Show page 404 (not found error)"""
 
     context = _init_default_context(request)
     return render(request, 'boards/404.html', context)
 
 
 @transaction.atomic
 def tag_subscribe(request, tag_name):
     """Add tag to favorites"""
 
     user = _get_user(request)
     tag = get_object_or_404(Tag, name=tag_name)
 
     if not tag in user.fav_tags.all():
         user.add_tag(tag)
 
     return _redirect_to_next(request)
 
 
 @transaction.atomic
 def tag_unsubscribe(request, tag_name):
     """Remove tag from favorites"""
 
     user = _get_user(request)
     tag = get_object_or_404(Tag, name=tag_name)
 
     if tag in user.fav_tags.all():
         user.remove_tag(tag)
 
     return _redirect_to_next(request)
 
 
 def static_page(request, name):
     """Show a static page that needs only tags list and a CSS"""
 
     context = _init_default_context(request)
     return render(request, 'boards/staticpages/' + name + '.html', context)
 
 
 def api_get_post(request, post_id):
     """
     Get the JSON of a post. This can be
     used as and API for external clients.
     """
 
     post = get_object_or_404(Post, id=post_id)
 
     json = serializers.serialize("json", [post], fields=(
         "pub_time", "_text_rendered", "title", "text", "image",
         "image_width", "image_height", "replies", "tags"
     ))
 
     return HttpResponse(content=json)
 
 
 @cache_page(86400)
 def cached_js_catalog(request, domain='djangojs', packages=None):
     return javascript_catalog(request, domain, packages)
 
 
 def _get_theme(request, user=None):
     """Get user's CSS theme"""
 
     if not user:
         user = _get_user(request)
     theme = user.get_setting('theme')
     if not theme:
         theme = neboard.settings.DEFAULT_THEME
 
     return theme
 
 
 def _init_default_context(request):
     """Create context with default values that are used in most views"""
 
     context = RequestContext(request)
 
     user = _get_user(request)
     context['user'] = user
     context['tags'] = user.get_sorted_fav_tags()
     context['posts_per_day'] = float(Post.objects.get_posts_per_day())
 
     theme = _get_theme(request, user)
     context['theme'] = theme
     context['theme_css'] = 'css/' + theme + '/base_page.css'
 
     # This shows the moderator panel
     moderate = user.get_setting(SETTING_MODERATE)
     if moderate == 'True':
         context['moderator'] = user.is_moderator()
     else:
         context['moderator'] = False
 
     return context
 
 
 def _get_user(request):
     """
     Get current user from the session. If the user does not exist, create
     a new one.
     """
 
     session = request.session
     if not 'user_id' in session:
         request.session.save()
 
         md5 = hashlib.md5()
         md5.update(session.session_key)
         new_id = md5.hexdigest()
 
         while User.objects.filter(user_id=new_id).exists():
             md5.update(str(timezone.now()))
             new_id = md5.hexdigest()
 
         time_now = timezone.now()
         user = User.objects.create(user_id=new_id, rank=RANK_USER,
                                    registration_time=time_now)
 
         _delete_old_users()
 
         session['user_id'] = user.id
     else:
         user = User.objects.get(id=session['user_id'])
 
     return user
 
 
 def _redirect_to_next(request):
     """
     If a 'next' parameter was specified, redirect to the next page. This is
     used when the user is required to return to some page after the current
     view has finished its work.
     """
 
     if 'next' in request.GET:
         next_page = request.GET['next']
         return HttpResponseRedirect(next_page)
     else:
         return redirect(index)
 
 
 @transaction.atomic
 def _ban_current_user(request):
     """Add current user to the IP ban list"""
 
     ip = utils.get_client_ip(request)
     ban, created = Ban.objects.get_or_create(ip=ip)
     if created:
         ban.can_read = False
         ban.reason = BAN_REASON_SPAM
     ban.save()
 
 
 def _remove_invalid_links(text):
     """
     Replace invalid links in posts so that they won't be parsed.
     Invalid links are links to non-existent posts
     """
 
     for reply_number in re.finditer(REGEX_REPLY, text):
         post_id = reply_number.group(1)
         post = Post.objects.filter(id=post_id)
         if not post.exists():
             text = string.replace(text, '>>' + post_id, post_id)
 
     return text
 
 
 def _datetime_to_epoch(datetime):
     return int(time.mktime(timezone.localtime(
         datetime,timezone.get_current_timezone()).timetuple())
                * 1000000 + datetime.microsecond)
 
 
 def _get_template_thread(thread_to_show):
     """Get template values for thread"""
 
     last_replies = thread_to_show.get_last_replies()
     skipped_replies_count = thread_to_show.get_replies().count() \
                             - len(last_replies) - 1
     return {
         'thread': thread_to_show,
         'op': thread_to_show.get_replies()[0],
         'bumpable': thread_to_show.can_bump(),
         'last_replies': last_replies,
         'skipped_replies': skipped_replies_count,
         }
 
 
 def _delete_old_users():
     """
     Delete users with no favorite tags and posted messages. These can be spam
     bots or just old user accounts
     """
 
     old_registration_date = datetime.now().date() - timedelta(OLD_USER_AGE_DAYS)
 
     for user in User.objects.annotate(tags_count=Count('fav_tags')).filter(
             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))