Added tag search. Refactored search to show any model results in a list.

boards/models/base.py

@@ -0,0 +1,10 b''
+__author__ = 'neko259'
+
+
+class Viewable():
+    def __init__(self):
+        pass
+
+    def get_view(self, *args, **kwargs):
+        """Get an HTML view for a model"""
+        pass
  No newline at end of file

boards/models/post.py

@@ -1,360 +1,396 b''
 from datetime import datetime, timedelta, date
 from datetime import time as dtime
 import logging
 import os
 from random import random
 import time
 import re
 import hashlib
 
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
+from django.template.loader import render_to_string
 from django.utils import timezone
 from markupfield.fields import MarkupField
+from boards.models.base import Viewable
+
 from boards.models.thread import Thread
-
 from neboard import settings
 from boards import thumbs
 
 
 APP_LABEL_BOARDS = 'boards'
 
 CACHE_KEY_PPD = 'ppd'
 CACHE_KEY_POST_URL = 'post_url'
 
 POSTS_PER_DAY_RANGE = range(7)
 
 BAN_REASON_AUTO = 'Auto'
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 200
 
 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+)')
 
 logger = logging.getLogger(__name__)
 
 
 class PostManager(models.Manager):
 
     def create_post(self, title, text, image=None, thread=None,
                     ip=NO_IP, tags=None, user=None):
         """
         Creates new post
         """
 
         posting_time = timezone.now()
         if not thread:
             thread = Thread.objects.create(bump_time=posting_time,
                                            last_edit_time=posting_time)
             new_thread = True
         else:
             thread.bump()
             thread.last_edit_time = posting_time
             thread.save()
             new_thread = False
 
         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)
 
         if new_thread:
             self._delete_old_threads()
         self.connect_replies(post)
 
         logger.info('Created post #%d' % post.id)
 
         return post
 
     def delete_post(self, post):
         """
         Deletes post and update or delete its thread
         """
 
         post_id = post.id
 
         thread = post.get_thread()
 
         if post.is_opening():
             thread.delete_with_posts()
         else:
             thread.last_edit_time = timezone.now()
             thread.save()
 
             post.delete()
 
         logger.info('Deleted post #%d' % post_id)
 
     def delete_posts_by_ip(self, ip):
         """
         Deletes 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 _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
         archive the old ones.
         """
 
         threads = Thread.objects.filter(archived=False).order_by('-bump_time')
         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()
 
             logger.info('Archived %d old threads' % num_threads_to_delete)
 
     def connect_replies(self, post):
         """
         Connects 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.build_refmap()
                 referenced_post.save()
 
                 referenced_thread = referenced_post.get_thread()
                 referenced_thread.last_edit_time = post.pub_time
                 referenced_thread.save()
 
     def get_posts_per_day(self):
         """
         Gets average count of posts per day for the last 7 days
         """
 
         today = date.today()
         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 + str(today), ppd)
         return ppd
 
 
-class Post(models.Model):
+class Post(models.Model, Viewable):
     """A post is a message."""
 
     objects = PostManager()
 
     class Meta:
         app_label = APP_LABEL_BOARDS
         ordering = ('id',)
 
     # TODO Save original file name to some field
     def _update_image_filename(self, filename):
         """
         Gets 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')
     image_hash = models.CharField(max_length=36)
 
     poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
 
     thread_new = models.ForeignKey('Thread', null=True, default=None,
             db_index=True)
     last_edit_time = models.DateTimeField()
     user = models.ForeignKey('User', null=True, default=None, db_index=True)
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
                                               blank=True, related_name='rfp+',
                                               db_index=True)
     refmap = models.TextField(null=True, blank=True)
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + self.title + ' (' + \
                self.text.raw[:50] + ')'
 
     def get_title(self):
         """
         Gets original post title or part of its text.
         """
 
         title = self.title
         if not title:
             title = self.text.rendered
 
         return title
 
     def build_refmap(self):
         map_string = ''
 
         first = True
         for refpost in self.referenced_posts.all():
             if not first:
                 map_string += ', '
             map_string += '<a href="%s">&gt;&gt;%s</a>' % (refpost.get_url(), refpost.id)
             first = False
 
         self.refmap = map_string
 
     def get_sorted_referenced_posts(self):
         return self.refmap
 
     def is_referenced(self):
         return len(self.refmap) > 0
 
     def is_opening(self):
         """
         Checks if this is an opening post or just a reply.
         """
 
         return self.get_thread().get_opening_post_id() == self.id
 
     def save(self, *args, **kwargs):
         """
         Saves the model and computes the image hash for deduplication purposes.
         """
 
         if not self.pk and self.image:
             md5 = hashlib.md5()
             for chunk in self.image.chunks():
                 md5.update(chunk)
             self.image_hash = md5.hexdigest()
         super(Post, self).save(*args, **kwargs)
 
     @transaction.atomic
     def add_tag(self, tag):
         edit_time = timezone.now()
 
         thread = self.get_thread()
         thread.add_tag(tag)
         self.last_edit_time = edit_time
         self.save()
 
         thread.last_edit_time = edit_time
         thread.save()
 
     @transaction.atomic
     def remove_tag(self, tag):
         edit_time = timezone.now()
 
         thread = self.get_thread()
         thread.remove_tag(tag)
         self.last_edit_time = edit_time
         self.save()
 
         thread.last_edit_time = edit_time
         thread.save()
 
     def get_url(self, thread=None):
         """
         Gets full url to the post.
         """
 
         cache_key = CACHE_KEY_POST_URL + str(self.id)
         link = cache.get(cache_key)
 
         if not link:
             if not thread:
                 thread = self.get_thread()
 
             opening_id = thread.get_opening_post_id()
 
             if self.id != opening_id:
                 link = reverse('thread', kwargs={
                     'post_id': opening_id}) + '#' + str(self.id)
             else:
                 link = reverse('thread', kwargs={'post_id': self.id})
 
             cache.set(cache_key, link)
 
         return link
 
     def get_thread(self):
         """
         Gets post's thread.
         """
 
         return self.thread_new
 
     def get_referenced_posts(self):
-        return self.referenced_posts.only('id', 'thread_new')
  No newline at end of file
+        return self.referenced_posts.only('id', 'thread_new')
+
+    def get_text(self):
+        return self.text
+
+    def get_view(self, moderator=False, need_open_link=False,
+                 truncated=False, *args, **kwargs):
+        if 'is_opening' in kwargs:
+            is_opening = kwargs['is_opening']
+        else:
+            is_opening = self.is_opening()
+
+        if 'thread' in kwargs:
+            thread = kwargs['thread']
+        else:
+            thread = self.get_thread()
+
+        if 'can_bump' in kwargs:
+            can_bump = kwargs['can_bump']
+        else:
+            can_bump = thread.can_bump()
+
+        opening_post_id = thread.get_opening_post_id()
+
+        return render_to_string('boards/post.html', {
+            'post': self,
+            'moderator': moderator,
+            'is_opening': is_opening,
+            'thread': thread,
+            'bumpable': can_bump,
+            'need_open_link': need_open_link,
+            'truncated': truncated,
+            'opening_post_id': opening_post_id,
+        })
+

boards/models/tag.py

@@ -1,128 +1,139 b''
+from django.template.loader import render_to_string
 from boards.models import Thread, Post
 from django.db import models
 from django.db.models import Count, Sum
+from django.core.urlresolvers import reverse
+from boards.models.base import Viewable
 
 __author__ = 'neko259'
 
 MAX_TAG_FONT = 1
 MIN_TAG_FONT = 0.2
 
 TAG_POPULARITY_MULTIPLIER = 20
 
 ARCHIVE_POPULARITY_MODIFIER = 0.5
 
 
 class TagManager(models.Manager):
 
     def get_not_empty_tags(self):
         """
         Gets tags that have non-archived threads.
         """
 
         tags = self.annotate(Count('threads')) \
             .filter(threads__count__gt=0).filter(threads__archived=False) \
             .order_by('name')
 
         return tags
 
 
-class Tag(models.Model):
+class Tag(models.Model, Viewable):
     """
     A tag is a text node assigned to the thread. The tag serves as a board
     section. There can be multiple tags for each thread
     """
 
     objects = TagManager()
 
     class Meta:
         app_label = 'boards'
         ordering = ('name',)
 
     name = models.CharField(max_length=100, db_index=True)
     threads = models.ManyToManyField(Thread, null=True,
                                      blank=True, related_name='tag+')
     linked = models.ForeignKey('Tag', null=True, blank=True)
 
     def __unicode__(self):
         return self.name
 
     def is_empty(self):
         """
         Checks if the tag has some threads.
         """
 
         return self.get_thread_count() == 0
 
     def get_thread_count(self):
         return self.threads.count()
 
     def get_popularity(self):
         """
         Gets tag's popularity value as a percentage of overall board post
         count.
         """
 
         all_post_count = Post.objects.count()
 
         tag_reply_count = 0.0
 
         tag_reply_count += self.get_post_count()
         tag_reply_count +=\
             self.get_post_count(archived=True) * ARCHIVE_POPULARITY_MODIFIER
 
         popularity = tag_reply_count / all_post_count
 
         return popularity
 
     def get_linked_tags(self):
         """
         Gets tags linked to the current one.
         """
 
         tag_list = []
         self.get_linked_tags_list(tag_list)
 
         return tag_list
 
     def get_linked_tags_list(self, tag_list=[]):
         """
         Returns the list of tags linked to current. The list can be got
         through returned value or tag_list parameter
         """
 
         linked_tag = self.linked
 
         if linked_tag and not (linked_tag in tag_list):
             tag_list.append(linked_tag)
 
             linked_tag.get_linked_tags_list(tag_list)
 
     def get_font_value(self):
         """
         Gets tag font value to differ most popular tags in the list
         """
 
         popularity = self.get_popularity()
 
         font_value = popularity * Tag.objects.get_not_empty_tags().count()
         font_value = max(font_value, MIN_TAG_FONT)
         font_value = min(font_value, MAX_TAG_FONT)
 
         return str(font_value)
 
     def get_post_count(self, archived=False):
         """
         Gets posts count for the tag's threads.
         """
 
         posts_count = 0
 
         threads = self.threads.filter(archived=archived)
         if threads.exists():
             posts_count = threads.annotate(posts_count=Count('replies')).aggregate(
                 posts_sum=Sum('posts_count'))['posts_sum']
 
         if not posts_count:
             posts_count = 0
 
         return posts_count
+
+    def get_url(self):
+        return reverse('tag', kwargs={'tag_name': self.name})
+
+    def get_view(self, *args, **kwargs):
+        return render_to_string('boards/tag.html', {
+            'tag': self,
+        })
  No newline at end of file

boards/search_indexes.py

@@ -1,14 +1,24 b''
 from haystack import indexes
-from boards.models import Post
+from boards.models import Post, Tag
 
 __author__ = 'neko259'
 
 
 class PostIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
 
     def get_model(self):
         return Post
 
     def index_queryset(self, using=None):
-        return self.get_model().objects.all()
  No newline at end of file
+        return self.get_model().objects.all()
+
+
+class TagIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, use_template=True)
+
+    def get_model(self):
+        return Tag
+
+    def index_queryset(self, using=None):
+        return self.get_model().objects.get_not_empty_tags()

boards/templates/boards/tag.html

@@ -1,96 +1,3 b''
-{% load i18n %}
-{% load board %}
-{% load cache %}
-
-{% get_current_language as LANGUAGE_CODE %}
-
-{% spaceless %}
-    {% cache 600 post post.id post.last_edit_time thread.archived bumpable truncated moderator LANGUAGE_CODE need_open_link %}
-        {% if thread.archived %}
-            <div class="post archive_post" id="{{ post.id }}">
-        {% elif bumpable %}
-            <div class="post" id="{{ post.id }}">
-        {% else %}
-            <div class="post dead_post" id="{{ post.id }}">
-        {% endif %}
-
-        <div class="post-info">
-            <a class="post_id" href="{% post_object_url post thread=thread %}"
-                {% if not truncated and not thread.archived %}
-                    onclick="javascript:addQuickReply('{{ post.id }}'); return false;"
-                    title="{% trans 'Quote' %}"
-                {% endif %}
-                >({{ post.id }}) </a>
-            <span class="title">{{ post.title }} </span>
-            <span class="pub_time">{{ post.pub_time }}</span>
-            {% if thread.archived %}
-                — {{ thread.bump_time }}
-            {% endif %}
-            {% if is_opening and need_open_link %}
-                {% if thread.archived %}
-                    [<a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>]
-                {% else %}
-                    [<a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>]
-                {% endif %}
-            {% endif %}
-
-            {% if moderator %}
-                <span class="moderator_info">
-                    [<a href="{% url 'post_admin' post_id=post.id %}"
-                        >{% trans 'Edit' %}</a>]
-                    [<a href="{% url 'delete' post_id=post.id %}"
-                        >{% trans 'Delete' %}</a>]
-                    ({{ post.poster_ip }})
-                    [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
-                        >{% trans 'Ban IP' %}</a>]
-                </span>
-            {% endif %}
-        </div>
-        {% 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">
-            {% autoescape off %}
-                {% if truncated %}
-                    {{ post.text.rendered|truncatewords_html:50 }}
-                {% else %}
-                    {{ post.text.rendered }}
-                {% endif %}
-            {% endautoescape %}
-            {% if post.is_referenced %}
-                <div class="refmap">
-                    {% autoescape off %}
-                        {% trans "Replies" %}: {{ post.refmap }}
-                    {% endautoescape %}
-                </div>
-            {% endif %}
-        </div>
-    {% endcache %}
-        {% if is_opening %}
-        {% cache 600 post_thread thread.id thread.last_edit_time LANGUAGE_CODE need_open_link %}
-            <div class="metadata">
-                {% if is_opening and need_open_link %}
-                    {{ thread.get_images_count }} {% trans 'images' %}.
-                {% endif %}
-                <span class="tags">
-                    {% for tag in thread.get_tags %}
-                        <a class="tag" href="{% url 'tag' tag.name %}">
-                            #{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
-                    {% endfor %}
-                </span>
-            </div>
-        {% endcache %}
-        {% endif %}
-        </div>
-{% endspaceless %}
+<div class="post">
+    <a class="tag" href="{% url 'tag' tag_name=tag.name %}">#{{ tag.name }}</a>
+</div>
  No newline at end of file

boards/templatetags/board.py

@@ -1,89 +1,89 b''
 from django.shortcuts import get_object_or_404
-from boards.models import Post
-from boards.views import thread, api
 from django import template
 
+
 register = template.Library()
 
 actions = [
     {
         'name': 'google',
         'link': 'http://google.com/searchbyimage?image_url=%s',
     },
     {
         'name': 'iqdb',
         'link': 'http://iqdb.org/?url=%s',
     },
 ]
 
 
 @register.simple_tag(name='post_url')
 def post_url(*args, **kwargs):
     post_id = args[0]
 
-    post = get_object_or_404(Post, id=post_id)
+    post = get_object_or_404('Post', id=post_id)
 
     return post.get_url()
 
 
 @register.simple_tag(name='post_object_url')
 def post_object_url(*args, **kwargs):
     post = args[0]
 
     if 'thread' in kwargs:
         post_thread = kwargs['thread']
     else:
         post_thread = None
 
     return post.get_url(thread=post_thread)
 
 
 @register.simple_tag(name='image_actions')
 def image_actions(*args, **kwargs):
     image_link = args[0]
     if len(args) > 1:
         image_link = 'http://' + args[1] + image_link # TODO https?
 
     result = ''
 
     for action in actions:
         result += '[<a href="' + action['link'] % image_link + '">' + \
                   action['name'] + '</a>]'
 
     return result
 
 
+# TODO Use get_view of a post instead of this
 @register.inclusion_tag('boards/post.html', name='post_view')
 def post_view(post, moderator=False, need_open_link=False, truncated=False,
               **kwargs):
     """
     Get post
     """
 
     if 'is_opening' in kwargs:
         is_opening = kwargs['is_opening']
     else:
         is_opening = post.is_opening()
 
     if 'thread' in kwargs:
         thread = kwargs['thread']
     else:
         thread = post.get_thread()
 
     if 'can_bump' in kwargs:
         can_bump = kwargs['can_bump']
     else:
         can_bump = thread.can_bump()
 
     opening_post_id = thread.get_opening_post_id()
 
     return {
         'post': post,
         'moderator': moderator,
         'is_opening': is_opening,
         'thread': thread,
         'bumpable': can_bump,
         'need_open_link': need_open_link,
         'truncated': truncated,
         'opening_post_id': opening_post_id,
     }

requirements.txt

@@ -1,8 +1,9 b''
+haystack
 pillow
 django>=1.6
 django_cleanup
 django-markupfield
 markdown
 python-markdown
 django-simple-captcha
 line-profiler

templates/search/indexes/boards/tag_text.txt

@@ -1,2 +1,1 b''
-{{ object.title }}
-{{ object.text }}
  No newline at end of file
+{{ object.name }}
  No newline at end of file

templates/search/search.html

@@ -1,29 +1,29 b''
 {% extends 'boards/base.html' %}
 
 {% load board %}
 {% load i18n %}
 
 {% block content %}
     <div class="post-form-w">
         <h3>{% trans 'Search' %}</h3>
         <form method="get" action=".">
             {{ form.as_p }}
             <input type="submit" value="{% trans 'Search' %}">
         </form>
     </div>
 
     {% if query %}
         {% for result in page.object_list %}
-            {% post_view result.object %}
+            {{ result.object.get_view }}
         {% empty %}
-            <p>{% trans 'No results found.' %}</p>
+            <div class="post">{% trans 'No results found.' %}</div>
         {% endfor %}
 
         {% if page.has_previous or page.has_next %}
             <div>
                 {% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; {% trans 'Previous' %}{% if page.has_previous %}</a>{% endif %}
                 {% if page.has_next %}<a href="?q={{ query }}&amp;page= {{ page.next_page_number }}">{% endif %}{% trans 'Next' %} &raquo; {% if page.has_next %}</a>{% endif %}
             </div>
         {% endif %}
     {% endif %}
 {% endblock %}
  No newline at end of file