{% block metapanel %}{% endblock %} [{% trans 'Login' %}] + [{% trans 'Search' %}] {% with ppd=posts_per_day|floatformat:2 %} {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %} {% endwith %} diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -75,7 +75,10 @@ urlpatterns = patterns('', name='get_thread'), url(r'^api/add_post/(?P\w+)/$', api.api_add_post, name='add_post'), - url(r'api/get_tag_popularity/(?P\w+)$', api.get_tag_popularity, + url(r'^api/get_tag_popularity/(?P\w+)$', api.get_tag_popularity, name='get_tag_popularity'), + # Search + url(r'^search/', include('haystack.urls')), + ) diff --git a/boards/utils.py b/boards/utils.py --- a/boards/utils.py +++ b/boards/utils.py @@ -1,10 +1,15 @@ """ 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 @@ 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 diff --git a/boards/views/all_tags.py b/boards/views/all_tags.py --- a/boards/views/all_tags.py +++ b/boards/views/all_tags.py @@ -3,6 +3,7 @@ from django.shortcuts import render from boards.views.base import BaseBoardView from boards.models.tag import Tag + class AllTagsView(BaseBoardView): def get(self, request): diff --git a/boards/views/all_threads.py b/boards/views/all_threads.py --- a/boards/views/all_threads.py +++ b/boards/views/all_threads.py @@ -1,6 +1,5 @@ import string -from django.core.urlresolvers import reverse from django.db import transaction from django.shortcuts import render, redirect @@ -30,7 +29,7 @@ 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 @@ 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 @@ 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()) diff --git a/boards/views/api.py b/boards/views/api.py --- a/boards/views/api.py +++ b/boards/views/api.py @@ -87,7 +87,7 @@ 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 @@ 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 @@ 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 diff --git a/boards/views/ban.py b/boards/views/ban.py --- a/boards/views/ban.py +++ b/boards/views/ban.py @@ -1,5 +1,6 @@ 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 @@ 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(): diff --git a/boards/views/base.py b/boards/views/base.py --- a/boards/views/base.py +++ b/boards/views/base.py @@ -1,15 +1,10 @@ -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 @@ 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): """ diff --git a/boards/views/delete_post.py b/boards/views/delete_post.py --- a/boards/views/delete_post.py +++ b/boards/views/delete_post.py @@ -1,5 +1,6 @@ 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 @@ 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() diff --git a/boards/views/post_admin.py b/boards/views/post_admin.py --- a/boards/views/post_admin.py +++ b/boards/views/post_admin.py @@ -9,7 +9,7 @@ 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 @@ 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') diff --git a/boards/views/settings.py b/boards/views/settings.py --- a/boards/views/settings.py +++ b/boards/views/settings.py @@ -1,5 +1,6 @@ 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 @@ 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 @@ 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(): diff --git a/boards/views/static.py b/boards/views/static.py --- a/boards/views/static.py +++ b/boards/views/static.py @@ -2,6 +2,7 @@ from django.shortcuts import render from boards.views.base import BaseBoardView + class StaticPageView(BaseBoardView): def get(self, request, name): diff --git a/boards/views/tag_threads.py b/boards/views/tag_threads.py --- a/boards/views/tag_threads.py +++ b/boards/views/tag_threads.py @@ -1,4 +1,5 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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) diff --git a/boards/views/thread.py b/boards/views/thread.py --- a/boards/views/thread.py +++ b/boards/views/thread.py @@ -1,17 +1,18 @@ -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 @@ 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) diff --git a/neboard/settings.py b/neboard/settings.py --- a/neboard/settings.py +++ b/neboard/settings.py @@ -105,6 +105,7 @@ 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 @@ 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 @@ 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), ) diff --git a/templates/search/indexes/boards/post_text.txt b/templates/search/indexes/boards/post_text.txt new file mode 100644 --- /dev/null +++ b/templates/search/indexes/boards/post_text.txt @@ -0,0 +1,2 @@ +{{ object.title }} +{{ object.text }} \ No newline at end of file diff --git a/templates/search/search.html b/templates/search/search.html new file mode 100644 --- /dev/null +++ b/templates/search/search.html @@ -0,0 +1,29 @@ +{% extends 'boards/base.html' %} + +{% load board %} +{% load i18n %} + +{% block content %} +

{% trans 'Search' %}

+ +

+ + {% if query %} + {% for result in page.object_list %} + {% post_view result.object %} + {% empty %} +

{% trans 'No results found.' %}

+ {% endfor %} + + {% if page.has_previous or page.has_next %} +

+ {% if page.has_previous %}{% endif %}« {% trans 'Previous' %}{% if page.has_previous %}{% endif %} + {% if page.has_next %}{% endif %}{% trans 'Next' %} » {% if page.has_next %}{% endif %} +

+ {% endif %} + {% endif %} +{% endblock %} \ No newline at end of file