Implemented form validation. When the form fails validation, showing the index page.

boards/forms.py

@@ -1,8 +1,41 b''
 from django import forms
 
 
-class NewThreadForm(forms.Form):
-    title = forms.CharField(max_length=100)
-    text = forms.CharField(widget=forms.Textarea)
-    image = forms.ImageField()
-    tags = forms.CharField(max_length=100)
+class PostForm(forms.Form):
+    MAX_TEXT_LENGTH = 10000
+    MAX_IMAGE_SIZE = 8 * 1024 * 1024
+
+    title = forms.CharField(max_length=50, required=False)
+    text = forms.CharField(widget=forms.Textarea, required=False)
+    image = forms.ImageField(required=False)
+    tags = forms.CharField(max_length=100, required=False)
+
+    def clean_text(self):
+        text = self.cleaned_data['text']
+        if text:
+            if len(text) > self.MAX_TEXT_LENGTH:
+                raise forms.ValidationError('Too many text')
+        return text
+
+    def clean_image(self):
+        image = self.cleaned_data['image']
+        if image:
+            if image._size > self.MAX_IMAGE_SIZE:
+                raise forms.ValidationError('Too large image: more than ' +
+                                            str(self.MAX_IMAGE_SIZE) + ' bytes')
+        return image
+
+    def clean(self):
+        cleaned_data = super(PostForm, self).clean()
+
+        text = cleaned_data.get('text')
+        image = cleaned_data.get('image')
+
+        if (not text) and (not image):
+            raise forms.ValidationError('Enter either text or image')
+
+        return cleaned_data
+
+
+class ThreadForm(PostForm):
+    tags = forms.CharField(max_length=100)
  No newline at end of file

boards/models.py

@@ -1,135 +1,145 b''
+import os
 from django.db import models
 from django.utils import timezone
+import time
 
 from neboard import settings
 
 import thumbs
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 
 
+def update_image_filename(instance, filename):
+    """Get unique image filename"""
+
+    path = 'images/'
+    new_name = str(int(time.mktime(time.gmtime()))) + '_' + filename
+    return os.path.join(path, new_name)
+
+
 class PostManager(models.Manager):
     def create_post(self, title, text, image=None, parent_id=NO_PARENT,
                     ip=NO_IP, tags=None):
         post = self.create(title=title,
                            text=text,
                            pub_time=timezone.now(),
                            parent=parent_id,
                            image=image,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,
                            last_edit_time=timezone.now())
 
         if tags:
             for tag in tags:
                 post.tags.add(tag)
 
         if parent_id != NO_PARENT:
             parent = self.get(id=parent_id)
             parent.last_edit_time=timezone.now()
             parent.save()
         else:
             self._delete_old_threads()
 
         return post
 
     def delete_post(self, post):
         children = self.filter(parent=post.id)
         for child in children:
             self.delete_post(child)
         post.delete()
 
     def delete_posts_by_ip(self, ip):
         posts = self.filter(poster_ip=ip)
         for post in posts:
             self.delete_post(post)
 
     def get_threads(self, tag=None):
         if tag:
             threads = self.filter(parent=NO_PARENT, tags=tag)
         else:
             threads = self.filter(parent=NO_PARENT)
         threads = list(threads.order_by('-last_edit_time'))
 
         return threads
 
     def get_thread(self, opening_post_id):
         opening_post = self.get(id=opening_post_id)
         replies = self.filter(parent=opening_post_id)
 
         thread = [opening_post]
         thread.extend(replies)
 
         return thread
 
     def exists(self, post_id):
         posts = self.filter(id=post_id)
 
         return len(posts) > 0
 
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
         delete the old ones.
         """
 
         # TODO Try to find a better way to get the active thread count.
 
         # TODO Move old threads to the archive instead of deleting them.
         # Maybe make some 'old' field in the model to indicate the thread
         # must not be shown and be able for replying.
 
         threads = self.get_threads()
         thread_count = len(threads)
 
         if thread_count > settings.MAX_THREAD_COUNT:
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[-num_threads_to_delete:]
 
             for thread in old_threads:
                 self.delete_post(thread)
 
 
 class Tag(models.Model):
     """
     A tag is a text node assigned to the post. The tag serves as a board
     section. There can be multiple tags for each message
     """
 
     name = models.CharField(max_length=100)
     # TODO Connect the tag to its posts to check the number of threads for
     # the tag.
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
-    title = models.CharField(max_length=100)
+    title = models.CharField(max_length=50)
     pub_time = models.DateTimeField()
     text = models.TextField()
-    image = thumbs.ImageWithThumbsField(upload_to='images/',
+    image = thumbs.ImageWithThumbsField(upload_to=update_image_filename,
                                         blank=True, sizes=((200, 150),))
     poster_ip = models.IPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
     last_edit_time = models.DateTimeField()
 
     def __unicode__(self):
         return self.title + ' (' + self.text + ')'
 
 
 class Admin(models.Model):
     """
     Model for admin users
     """
     name = models.CharField(max_length=100)
     password = models.CharField(max_length=100)
 
     def __unicode__(self):
         return self.name + '/' + '*' * len(self.password)
 

boards/static/css/base_page.css

@@ -1,72 +1,71 b''
 html {
-    background: #333;
+    background: #444;
     color: #ffffff;
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .title {
     font-weight: bold;
     color: #ffcc00;
 }
 
 .post-form {
     text-align: left;
-    color: #ffffff;
     display: table;
-    border: dashed 1px;
-    padding: 3px;
+    border-radius: 5px;
+    padding: 5px;
     margin: 5px;
+    background: #334;
 }
 
 .form-row {
     display: table-row;
 }
 
 .form-input {
     display: table-cell;
 }
 
 .link {
     color: #829dba;
 }
 
 .link:hover {
     color: #ba9f82;
 }
 
 .post_id {
     color: #ffffff;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .tag {
     color: #b4cfec;
 }
 
 .tag:hover {
     color: #d0edb4;
 }
 
 .post_id {
     color: #fff380;
 }
 
 .post {
-    background: #222;
+    background: #333;
     margin: 5px;
-    padding: 5px;
-    border: solid 1px;
+    padding: 10px;
     border-radius: 5px;
 }
 
 .form-title {
     font-weight: bolder;
 }
  No newline at end of file

boards/views.py

@@ -1,125 +1,133 b''
 from django.template import RequestContext
 from boards import forms
 import boards
-from boards.forms import NewThreadForm
+from boards.forms import ThreadForm, PostForm
 from boards.models import Post, Admin, Tag
 from django.shortcuts import render, get_list_or_404, redirect
 from django.http import HttpResponseRedirect, Http404
 
 
 def index(request):
     context = RequestContext(request)
 
     if request.method == 'POST':
         return new_post(request)
     else:
         threads = Post.objects.get_threads()
 
         context['threads'] = None if len(threads) == 0 else threads
-        context['form'] = forms.NewThreadForm()
+        context['form'] = forms.ThreadForm()
 
         return render(request, 'posting_general.html',
                       context)
 
 
 def new_post(request, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
-    form = NewThreadForm(request.POST, request.FILES)
+    if thread_id == boards.models.NO_PARENT:
+        form = ThreadForm(request.POST, request.FILES)
+    else:
+        form = PostForm(request.POST, request.FILES)
 
-    title = request.POST['title']
-    text = request.POST['text']
+    if form.is_valid():
+        data = form.cleaned_data
+    else:
+        return redirect(index)
 
-    if 'image' in request.FILES.keys():
-        image = request.FILES['image']
+    title = data['title']
+    text = data['text']
+
+    if 'image' in data.keys():
+        image = data['image']
     else:
         image = None
 
     ip = request.META['REMOTE_ADDR']
 
     tags = []
     if thread_id == boards.models.NO_PARENT:
-        tag_strings = request.POST['tags']
+        tag_strings = data['tags']
 
         if tag_strings:
             tag_strings = tag_strings.split(',')
             for tag_name in tag_strings:
                 tag_name = tag_name.strip()
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
     # TODO Add a possibility to define a link image instead of an image file.
     # If a link is given, download the image automatically.
 
     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                     parent_id=thread_id, image=image,
                                     tags=tags)
 
     thread_to_show = (post.id if thread_id == boards.models.NO_PARENT else
                       thread_id)
     return redirect(thread, post_id=thread_to_show)
 
 
 def tag(request, tag_name):
     """Get all tag threads (posts without a parent)."""
 
     tag = Tag.objects.get(name=tag_name)
     threads = Post.objects.get_threads(tag=tag)
 
     if request.method == 'POST':
         return new_post(request)
     else:
         context = RequestContext(request)
         context['threads'] = None if len(threads) == 0 else threads
         context['tag'] = tag_name
 
-        context['form'] = forms.NewThreadForm(initial={'tags': tag_name})
+        context['form'] = forms.ThreadForm(initial={'tags': tag_name})
 
         return render(request, 'posting_general.html',
                       context)
 
 
 def thread(request, post_id):
     """Get all thread posts"""
 
     if request.method == 'POST':
         return new_post(request, post_id)
     else:
         # TODO Show 404 if there is no such thread
         posts = Post.objects.get_thread(post_id)
 
         context = RequestContext(request)
         context['posts'] = posts
 
-        context['form'] = forms.NewThreadForm()
+        context['form'] = forms.PostForm()
 
         return render(request, 'thread.html', context)
 
 
 def login(request):
     """Log in as admin"""
 
     if 'name' in request.POST and 'password' in request.POST:
         request.session['admin'] = False
 
         isAdmin = len(Admin.objects.filter(name=request.POST['name'],
                                            password=request.POST[
                                                'password'])) > 0
 
         if isAdmin:
             request.session['admin'] = True
 
             response = HttpResponseRedirect('/')
 
         else:
             response = render(request, 'login.html', {'error': 'Login error'})
     else:
         response = render(request, 'login.html', {})
 
     return response
 
 
 def logout(request):
     request.session['admin'] = False
     return HttpResponseRedirect('/')
  No newline at end of file