Implemented search over posts. Moved get_user and get_theme to utils module. Use context processors instead of creating context in the base view. Removed unused imports in some modules

boards/context_processors.py

@@ -0,0 +1,31 b''
+from boards import utils
+from boards.models import Post
+from boards.models.post import SETTING_MODERATE
+import neboard
+
+__author__ = 'neko259'
+
+
+def user_and_ui_processor(request):
+    context = {}
+
+    user = utils.get_user(request)
+    context['user'] = user
+    context['tags'] = user.fav_tags.all()
+    context['posts_per_day'] = float(Post.objects.get_posts_per_day())
+
+    theme = utils.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
+
+    context['version'] = neboard.settings.VERSION
+    context['site_name'] = neboard.settings.SITE_NAME
+
+    return context
  No newline at end of file

boards/search_indexes.py

@@ -0,0 +1,14 b''
+from haystack import indexes
+from boards.models import Post
+
+__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

templates/search/indexes/boards/post_text.txt

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

templates/search/search.html

@@ -0,0 +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 %}
+        {% empty %}
+            <p>{% trans 'No results found.' %}</p>
+        {% 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

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-08 21:35+0300\n"
+"POT-Creation-Date: 2014-06-15 12:34+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -98,27 +98,27 b' msgstr "\xd0\x9f\xd0\xbe\xd0\xb4\xd0\xbe\xd0\xb6\xd0\xb4\xd0\xb8\xd1\x82\xd0\xb5 %s \xd1\x81\xd0\xb5\xd0\xba\xd1\x83\xd0\xbd\xd0\xb4 \xd0\xbf\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5 \xd0\xbf\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb5\xd0\xb3\xd0\xbe \xd0\xbf\xd0\xbe\xd1\x81\xd1\x82\xd0\xb8\xd0\xbd\xd0\xb3\xd0\xb0"'
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:225 forms.py:344
+#: forms.py:224 forms.py:343
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:253 forms.py:274
+#: forms.py:252 forms.py:273
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:280
+#: forms.py:279
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:285
+#: forms.py:284
 msgid "Enable moderation panel"
 msgstr "Включить панель модерации"
 
-#: forms.py:300
+#: forms.py:299
 msgid "No such user found"
 msgstr "Данный пользователь не найден"
 
-#: forms.py:314
+#: forms.py:313
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -147,41 +147,41 b' msgstr "\xd0\xbb\xd0\xb8\xd1\x86\xd0\xb5\xd0\xbd\xd0\xb7\xd0\xb8\xd0\xb5\xd0\xb9"'
 msgid "Repository"
 msgstr "Репозиторий"
 
-#: templates/boards/base.html:14
+#: templates/boards/base.html:11
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:31
+#: templates/boards/base.html:28
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:36
+#: templates/boards/base.html:33
 msgid "Tag management"
 msgstr "Управление тегами"
 
-#: templates/boards/base.html:38 templates/boards/settings.html:7
+#: templates/boards/base.html:35 templates/boards/settings.html:7
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:50 templates/boards/login.html:6
-#: templates/boards/login.html.py:21
+#: templates/boards/base.html:47 templates/boards/login.html:6
+#: templates/boards/login.html.py:16
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:52
+#: templates/boards/base.html:48
+msgid "Search"
+msgstr "Поиск"
+
+#: templates/boards/base.html:50
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:54
+#: templates/boards/base.html:52
 msgid "Up"
 msgstr "Вверх"
 
-#: templates/boards/login.html:15
-msgid "User ID"
-msgstr "ID пользователя"
-
-#: templates/boards/login.html:24
+#: templates/boards/login.html:19
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
@@ -386,5 +386,5 b' msgstr "\xd0\x9f\xd0\xb5\xd1\x80\xd0\xb5\xd0\xb4 \xd1\x8d\xd1\x82\xd0\xb8\xd0\xbc\xd0\xb8 \xd1\x82\xd0\xb5\xd0\xb3\xd0\xb0\xd0\xbc\xd0\xb8 \xd0\xbd\xd1\x83\xd0\xb6\xd0\xbd\xd0\xb0 \xd0\xbd\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x8f \xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xba\xd0\xb0:"'
 msgid "Comment"
 msgstr "Комментарий"
 
-#~ msgid "Archive"
-#~ msgstr "Архив"
+#~ msgid "User ID"
+#~ msgstr "ID пользователя"

boards/middlewares.py

@@ -1,8 +1,9 b''
 from django.shortcuts import redirect
-from boards import views, utils
+from boards import utils
 from boards.models import Ban
 from django.utils.html import strip_spaces_between_tags
 from django.conf import settings
+from boards.views.banned import BannedView
 
 RESPONSE_CONTENT_TYPE = 'Content-Type'
 
@@ -17,7 +18,7 b' class BanMiddleware:'
 
     def process_view(self, request, view_func, view_args, view_kwargs):
 
-        if view_func != views.banned.BannedView.as_view:
+        if view_func != BannedView.as_view:
             ip = utils.get_client_ip(request)
             bans = Ban.objects.filter(ip=ip)
 

boards/templates/boards/base.html

@@ -6,12 +6,9 b''
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css"
-        href="{% static 'css/base.css' %}" media="all"/>
-    <link rel="stylesheet" type="text/css"
-	href="{% static theme_css %}" media="all"/>
-    <link rel="alternate" type="application/rss+xml" href="rss/" title=
-	"{% trans 'Feed' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
+    <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
+    <link rel="alternate" type="application/rss+xml" href="rss/" title="{% trans 'Feed' %}"/>
 
     <link rel="icon" type="image/png"
         href="{% static 'favicon.png' %}">
@@ -48,6 +45,7 b''
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
+    [<a href="{% url "haystack_search" %}">{% trans 'Search' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}

boards/urls.py

@@ -75,7 +75,10 b" urlpatterns = patterns('',"
             name='get_thread'),
     url(r'^api/add_post/(?P<opening_post_id>\w+)/$', api.api_add_post,
             name='add_post'),
-    url(r'api/get_tag_popularity/(?P<tag_name>\w+)$', api.get_tag_popularity,
+    url(r'^api/get_tag_popularity/(?P<tag_name>\w+)$', api.get_tag_popularity,
             name='get_tag_popularity'),
 
+    # Search
+    url(r'^search/', include('haystack.urls')),
+
 )

boards/utils.py

@@ -1,10 +1,15 b''
 """
 This module contains helper functions and helper classes.
 """
+import hashlib
 from django.utils import timezone
 
 from neboard import settings
+from boards.models import Post, User
+from boards.models.post import SETTING_MODERATE
+from boards.models.user import RANK_USER
 import time
+import neboard
 
 
 KEY_CAPTCHA_FAILS = 'key_captcha_fails'
@@ -77,4 +82,48 b' def get_client_ip(request):'
 def datetime_to_epoch(datetime):
     return int(time.mktime(timezone.localtime(
         datetime,timezone.get_current_timezone()).timetuple())
-               * 1000000 + datetime.microsecond)
  No newline at end of file
+               * 1000000 + datetime.microsecond)
+
+
+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)
+
+        session['user_id'] = user.id
+    else:
+        user = User.objects.select_related('fav_tags').get(
+            id=session['user_id'])
+
+    return user
+
+
+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
  No newline at end of file

boards/views/all_tags.py

@@ -3,6 +3,7 b' from django.shortcuts import render'
 from boards.views.base import BaseBoardView
 from boards.models.tag import Tag
 
+
 class AllTagsView(BaseBoardView):
 
     def get(self, request):

boards/views/all_threads.py

@@ -1,6 +1,5 b''
 import string
 
-from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.shortcuts import render, redirect
 
@@ -30,7 +29,7 b' class AllThreadsView(PostMixin, BaseBoar'
     def get(self, request, page=DEFAULT_PAGE, form=None):
         context = self.get_context_data(request=request)
 
-        self.user = context['user']
+        self.user = utils.get_user(request)
 
         if not form:
             form = ThreadForm(error_class=PlainErrorList)
@@ -70,7 +69,8 b' class AllThreadsView(PostMixin, BaseBoar'
         context[PARAMETER_PAGINATOR] = paginator
         context[PARAMETER_CURRENT_PAGE] = paginator.page(int(page))
 
-    def parse_tags_string(self, tag_strings):
+    @staticmethod
+    def parse_tags_string(tag_strings):
         """
         Parses tag list string and returns tag object list.
         """
@@ -120,7 +120,7 b' class AllThreadsView(PostMixin, BaseBoar'
 
         post = Post.objects.create_post(title=title, text=text, ip=ip,
                                         image=image, tags=tags,
-                                        user=self._get_user(request))
+                                        user=utils.get_user(request))
 
         if html_response:
             return redirect(post.get_url())

boards/views/api.py

@@ -87,7 +87,7 b' def api_add_post(request, opening_post_i'
             status = STATUS_ERROR
         if form.is_valid():
             post = ThreadView().new_post(request, form, opening_post,
-                                           html_response=False)
+                                         html_response=False)
             if not post:
                 status = STATUS_ERROR
             else:
@@ -153,7 +153,7 b' def api_get_threads(request, count):'
 
         # TODO Add tags, replies and images count
         opening_posts.append(_get_post_data(opening_post.id,
-            include_last_update=True))
+                                            include_last_update=True))
 
     return HttpResponse(content=json.dumps(opening_posts))
 
@@ -241,5 +241,5 b' def _get_post_data(post_id, format_type='
             post_json['image_preview'] = post.image.url_200x150
         if include_last_update:
             post_json['bump_time'] = datetime_to_epoch(
-                    post.thread_new.bump_time)
+                post.thread_new.bump_time)
         return post_json

boards/views/ban.py

@@ -1,5 +1,6 b''
 from django.db import transaction
 from django.shortcuts import get_object_or_404
+from boards import utils
 
 from boards.views.base import BaseBoardView
 from boards.models import Post, Ban
@@ -10,7 +11,7 b' class BanUserView(BaseBoardView, Redirec'
 
     @transaction.atomic
     def get(self, request, post_id):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         post = get_object_or_404(Post, id=post_id)
 
         if user.is_moderator():

boards/views/base.py

@@ -1,15 +1,10 b''
-from datetime import datetime, timedelta
-import hashlib
 from django.db import transaction
-from django.db.models import Count
 from django.template import RequestContext
-from django.utils import timezone
 from django.views.generic import View
+
 from boards import utils
-from boards.models import User, Post
-from boards.models.post import SETTING_MODERATE
-from boards.models.user import RANK_USER, Ban
-import neboard
+from boards.models.user import Ban
+
 
 BAN_REASON_SPAM = 'Autoban: spam bot'
 
@@ -20,78 +15,11 b' class BaseBoardView(View):'
 
     def get_context_data(self, **kwargs):
         request = kwargs['request']
-        context = self._default_context(request)
-
-        context['version'] = neboard.settings.VERSION
-        context['site_name'] = neboard.settings.SITE_NAME
-
-        return context
-
-    def _default_context(self, request):
-        """Create context with default values that are used in most views"""
-
+        # context = self._default_context(request)
         context = RequestContext(request)
 
-        user = self._get_user(request)
-        context['user'] = user
-        context['tags'] = user.fav_tags.all()
-        context['posts_per_day'] = float(Post.objects.get_posts_per_day())
-
-        theme = self._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(self, 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)
-
-            session['user_id'] = user.id
-        else:
-            user = User.objects.select_related('fav_tags').get(
-                id=session['user_id'])
-
-        return user
-
-    def _get_theme(self, request, user=None):
-        """
-        Get user's CSS theme
-        """
-
-        if not user:
-            user = self._get_user(request)
-        theme = user.get_setting('theme')
-        if not theme:
-            theme = neboard.settings.DEFAULT_THEME
-
-        return theme
-
     @transaction.atomic
     def _ban_current_user(self, request):
         """

boards/views/delete_post.py

@@ -1,5 +1,6 b''
 from django.shortcuts import redirect, get_object_or_404
 from django.db import transaction
+from boards import utils
 
 from boards.views.base import BaseBoardView
 from boards.views.mixins import RedirectNextMixin
@@ -10,7 +11,7 b' class DeletePostView(BaseBoardView, Redi'
 
     @transaction.atomic
     def get(self, request, post_id):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         post = get_object_or_404(Post, id=post_id)
 
         opening_post = post.is_opening()

boards/views/post_admin.py

@@ -9,7 +9,7 b' from boards.forms import AddTagForm, Pla'
 class PostAdminView(BaseBoardView, DispatcherMixin):
 
     def get(self, request, post_id, form=None):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         if not user.is_moderator:
             redirect('index')
 
@@ -30,7 +30,7 b' class PostAdminView(BaseBoardView, Dispa'
         return render(request, 'boards/post_admin.html', context)
 
     def post(self, request, post_id):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         if not user.is_moderator:
             redirect('index')
 

boards/views/settings.py

@@ -1,5 +1,6 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
+from boards import utils
 
 from boards.views.base import BaseBoardView, PARAMETER_FORM
 from boards.forms import SettingsForm, ModeratorSettingsForm, PlainErrorList
@@ -10,15 +11,16 b' class SettingsView(BaseBoardView):'
 
     def get(self, request):
         context = self.get_context_data(request=request)
-        user = context['user']
+        user = utils.get_user(request)
         is_moderator = user.is_moderator()
 
-        selected_theme = context['theme']
+        selected_theme = utils.get_theme(request, user)
 
         if is_moderator:
             form = ModeratorSettingsForm(initial={
                 'theme': selected_theme,
-                'moderate': context['moderator']
+                'moderate': user.get_setting(SETTING_MODERATE) and \
+                            user.is_moderator()
             }, error_class=PlainErrorList)
         else:
             form = SettingsForm(initial={'theme': selected_theme},
@@ -29,8 +31,7 b' class SettingsView(BaseBoardView):'
         return render(request, 'boards/settings.html', context)
 
     def post(self, request):
-        context = self.get_context_data(request=request)
-        user = context['user']
+        user = utils.get_user(request)
         is_moderator = user.is_moderator()
 
         with transaction.atomic():

boards/views/static.py

@@ -2,6 +2,7 b' from django.shortcuts import render'
 
 from boards.views.base import BaseBoardView
 
+
 class StaticPageView(BaseBoardView):
 
     def get(self, request, name):

boards/views/tag_threads.py

@@ -1,4 +1,5 b''
 from django.shortcuts import get_object_or_404
+from boards import utils
 from boards.models import Tag, Post
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
 from boards.views.mixins import DispatcherMixin, RedirectNextMixin
@@ -47,7 +48,7 b' class TagView(AllThreadsView, Dispatcher'
         return self.get(request, tag_name, page, form)
 
     def subscribe(self, request):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         if not tag in user.fav_tags.all():
@@ -56,7 +57,7 b' class TagView(AllThreadsView, Dispatcher'
         return self.redirect_to_next(request)
 
     def unsubscribe(self, request):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         if tag in user.fav_tags.all():
@@ -70,7 +71,7 b' class TagView(AllThreadsView, Dispatcher'
         shown.
         """
 
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         user.hide_tag(tag)
@@ -80,7 +81,7 b' class TagView(AllThreadsView, Dispatcher'
         Removed tag from user's hidden tags.
         """
 
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         user.unhide_tag(tag)

boards/views/thread.py

@@ -1,17 +1,18 b''
-import string
 from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.http import Http404
 from django.shortcuts import get_object_or_404, render, redirect
 from django.views.generic.edit import FormMixin
+
 from boards import utils
 from boards.forms import PostForm, PlainErrorList
-from boards.models import Post, Ban, Tag
+from boards.models import Post, Ban
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, PARAMETER_FORM
 from boards.views.posting_mixin import PostMixin
 import neboard
 
+
 MODE_GALLERY = 'gallery'
 MODE_NORMAL = 'normal'
 
@@ -119,7 +120,7 b' class ThreadView(BaseBoardView, PostMixi'
         post = Post.objects.create_post(title=title, text=text, ip=ip,
                                         thread=post_thread, image=image,
                                         tags=tags,
-                                        user=self._get_user(request))
+                                        user=utils.get_user(request))
 
         thread_to_show = (opening_post.id if opening_post else post.id)
 

neboard/settings.py

@@ -105,6 +105,7 b' TEMPLATE_CONTEXT_PROCESSORS = ('
     'django.core.context_processors.static',
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
+    'boards.context_processors.user_and_ui_processor',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -137,15 +138,22 b' INSTALLED_APPS = ('
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
-     'django.contrib.admin',
+    'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
     'django_cleanup',
-    'boards',
-    'captcha',
+
+    # Migrations
     'south',
     'debug_toolbar',
+
+    'captcha',
+
+    # Search
+    'haystack',
+
+    'boards',
 )
 
 DEBUG_TOOLBAR_PANELS = (
@@ -201,6 +209,15 b' LOGGING = {'
     },
 }
 
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
+    },
+}
+
+HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
+
 MARKUP_FIELD_TYPES = (
     ('markdown', markdown_extended),
 )