Moved login view to a separate class. Refactored thread and all threads views

boards/views/login.py

@@ -0,0 +1,30 b''
+from django.shortcuts import render, redirect
+from boards.forms import LoginForm, PlainErrorList
+from boards.models import User
+from boards.views.base import BaseBoardView, PARAMETER_FORM
+
+__author__ = 'neko259'
+
+
+class LoginView(BaseBoardView):
+
+    def get(self, request, form=None):
+        context = self.get_context_data(request=request)
+
+        if not form:
+            form = LoginForm()
+        context[PARAMETER_FORM] = form
+
+        return render(request, 'boards/login.html', context)
+
+    def post(self, request):
+        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:
+            return self.get(request, form)

boards/templates/boards/post.html

@@ -4,7 +4,7 b''
 
 {% get_current_language as LANGUAGE_CODE %}
 
-{% cache 60 post post.id post.thread_new.last_edit_time truncated moderator LANGUAGE_CODE %}
+{% cache 300 post post.id post.thread_new.last_edit_time truncated moderator LANGUAGE_CODE need_open_link %}
     {% spaceless %}
         {% with thread=post.thread_new %}
             {% if thread.archived %}
@@ -93,4 +93,4 b''
         </div>
         {% endwith %}
     {% endspaceless %}
-{% endcache %}
  No newline at end of file
+{% endcache %}

boards/urls.py

@@ -1,7 +1,7 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
-from boards.views import api, tag_threads, all_threads, archived_threads
+from boards.views import api, tag_threads, all_threads, archived_threads, login
 
 js_info_dict = {
     'packages': ('boards',),
@@ -20,7 +20,7 b" urlpatterns = patterns('',"
         archived_threads.ArchiveView.as_view(), name='archive'),
 
     # login page
-    url(r'^login/$', views.login, name='login'),
+    url(r'^login/$', login.LoginView.as_view(), name='login'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),

boards/views/__init__.py

@@ -1,12 +1,6 b''
-from datetime import datetime, timedelta
-
-from django.db.models import Count
-
 __author__ = 'neko259'
 
 import hashlib
-import string
-import re
 
 from django.core import serializers
 from django.core.urlresolvers import reverse
@@ -20,15 +14,13 b' from django.views.decorators.cache impor'
 from django.views.i18n import javascript_catalog
 
 import boards
-from boards import utils
 from boards.forms import SettingsForm, PlainErrorList, \
-    LoginForm, ModeratorSettingsForm
+    ModeratorSettingsForm
 from boards.models import Post, Tag, Ban, User
-from boards.models.post import SETTING_MODERATE, REGEX_REPLY
+from boards.models.post import SETTING_MODERATE
 from boards.models.user import RANK_USER
 from boards import authors
 import neboard
-
 import all_threads
 
 
@@ -37,29 +29,6 b" BAN_REASON_SPAM = 'Autoban: spam bot'"
 DEFAULT_PAGE = 1
 
 
-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"""
 
@@ -311,46 +280,4 b' def _redirect_to_next(request):'
         next_page = request.GET['next']
         return HttpResponseRedirect(next_page)
     else:
-        return redirect('index')
-
-
[e-mail]
-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 _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,
-        }
+        return redirect('index')
  No newline at end of file

boards/views/all_threads.py

@@ -25,10 +25,11 b' DEFAULT_PAGE = 1'
 
 class AllThreadsView(PostMixin, BaseBoardView):
 
-    def get(self, request, page=DEFAULT_PAGE):
+    def get(self, request, page=DEFAULT_PAGE, form=None):
         context = self.get_context_data(request=request)
 
-        form = ThreadForm(error_class=PlainErrorList)
+        if not form:
+            form = ThreadForm(error_class=PlainErrorList)
 
         paginator = Paginator(self.get_threads(),
                               neboard.settings.THREADS_PER_PAGE)
@@ -55,17 +56,7 b' class AllThreadsView(PostMixin, BaseBoar'
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
-        paginator = Paginator(self.get_threads(),
-                              neboard.settings.THREADS_PER_PAGE)
-
-        threads = paginator.page(page).object_list
-
-        context[PARAMETER_THREADS] = threads
-        context[PARAMETER_FORM] = form
-
-        self._get_page_context(paginator, context, page)
-
-        return render(request, TEMPLATE, context)
+        return self.get(request, page, form)
 
     @staticmethod
     def _get_page_context(paginator, context, page):
@@ -131,4 +122,4 b' class AllThreadsView(PostMixin, BaseBoar'
                 return redirect('thread', post_id=thread_to_show)
 
     def get_threads(self):
-        return Thread.objects.filter(archived=False)
  No newline at end of file
+        return Thread.objects.filter(archived=False)

boards/views/thread.py

@@ -17,14 +17,15 b" MODE_NORMAL = 'normal'"
 
 class ThreadView(BaseBoardView, PostMixin):
 
-    def get(self, request, post_id, mode=MODE_NORMAL):
+    def get(self, request, post_id, mode=MODE_NORMAL, form=None):
         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
 
-        form = PostForm(error_class=PlainErrorList)
+        if not form:
+            form = PostForm(error_class=PlainErrorList)
 
         thread_to_show = opening_post.thread_new
 
@@ -75,36 +76,7 b' class ThreadView(BaseBoardView, PostMixi'
                 # Ban user because he is suspected to be a bot
                 self._ban_current_user(request)
 
-            thread_to_show = opening_post.thread_new
-
-            context = self.get_context_data(request=request)
-
-            posts = thread_to_show.get_replies()
-            context[PARAMETER_FORM] = form
-            context["last_update"] = utils.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)
+            return self.get(request, post_id, mode, form)
 
     @transaction.atomic
     def new_post(self, request, form, opening_post=None, html_response=True):
@@ -146,4 +118,4 b' class ThreadView(BaseBoardView, PostMixi'
             if opening_post:
                 return redirect(reverse('thread',
                             kwargs={'post_id': thread_to_show}) + '#'
-                                + str(post.id))
  No newline at end of file
+                                + str(post.id))