Refactored post image

boards/models/image.py

@@ -1,62 +1,83 b''
 import hashlib
 import os
 from random import random
 import time
 from django.db import models
 from boards import thumbs
+from boards.models.base import Viewable
 
 __author__ = 'neko259'
 
 
 IMAGE_THUMB_SIZE = (200, 150)
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
+HASH_LENGTH = 36
+
+CSS_CLASS_IMAGE = 'image'
+CSS_CLASS_THUMB = 'thumb'
 
 
-class PostImage(models.Model):
+class PostImage(models.Model, Viewable):
     class Meta:
         app_label = 'boards'
         ordering = ('id',)
 
     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)
 
     width = models.IntegerField(default=0)
     height = models.IntegerField(default=0)
 
     pre_width = models.IntegerField(default=0)
     pre_height = models.IntegerField(default=0)
 
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=(IMAGE_THUMB_SIZE,),
                                         width_field='width',
                                         height_field='height',
                                         preview_width_field='pre_width',
                                         preview_height_field='pre_height')
-    hash = models.CharField(max_length=36)
+    hash = models.CharField(max_length=HASH_LENGTH)
 
     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.hash = md5.hexdigest()
         super(PostImage, self).save(*args, **kwargs)
 
     def __str__(self):
         return self.image.url
 
+    def get_view(self):
+        return '<div class="{}">' \
+               '<a class="{}" href="{}">' \
+               '<img' \
+               ' src="{}"' \
+               ' alt="{}"' \
+               ' width="{}"' \
+               ' height="{}"' \
+               ' data-width="{}"' \
+               ' data-height="{}" />' \
+               '</a>' \
+               '</div>'\
+            .format(CSS_CLASS_IMAGE, CSS_CLASS_THUMB, self.image.url,
+                    self.image.url_200x150,
+                    str(self.hash), str(self.pre_width),
+                    str(self.pre_height), str(self.width), str(self.height))

boards/templates/boards/post.html

@@ -1,96 +1,97 b''
 {% load i18n %}
 {% load board %}
 {% load cache %}
 
 {% get_current_language as LANGUAGE_CODE %}
 
 {% 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>
     {% comment %}
         Thread death time needs to be shown only if the thread is alredy archived
         and this is an opening post (thread death time) or a post for popup
         (we don't see OP here so we show the death time in the post itself).
     {% endcomment %}
     {% if thread.archived %}
         {% if is_opening %}
         — {{ thread.bump_time }}
         {% endif %}
     {% 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 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>]
             {% if is_opening %}
                 [<a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>]
             {% endif %}
         </span>
     {% endif %}
 </div>
+{% comment %}
+    Post images. Currently only 1 image can be posted and shown, but post model
+    supports multiple.
+{%  endcomment %}
 {% if post.images.exists %}
     {% with post.images.all.0 as image %}
-        <div class="image">
-            <a
-                    class="thumb"
-                    href="{{ image.image.url }}"><img
-                    src="{{ image.image.url_200x150 }}"
-                    alt="{{ post.id }}"
-                    width="{{ image.pre_width }}"
-                    height="{{ image.pre_height }}"
-                    data-width="{{ image.width }}"
-                    data-height="{{ image.height }}"/>
-            </a>
-        </div>
+        {% autoescape off %}
+            {{ image.get_view }}
+        {% endautoescape %}
     {% endwith %}
 {% endif %}
+{% comment %}
+    Post message (text)
+{% endcomment %}
 <div class="message">
     {% autoescape off %}
         {% if truncated %}
             {{ post.get_text|truncatewords_html:50 }}
         {% else %}
             {{ post.get_text }}
         {% endif %}
     {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
             {% autoescape off %}
                 {% trans "Replies" %}: {{ post.refmap }}
             {% endautoescape %}
         </div>
     {% endif %}
 </div>
+{% comment %}
+    Thread metadata: counters, tags etc
+{% endcomment %}
 {% if is_opening %}
     <div class="metadata">
         {% if is_opening and need_open_link %}
             {{ thread.get_reply_count }} {% trans 'messages' %},
             {{ thread.get_images_count }} {% trans 'images' %}.
         {% endif %}
         <span class="tags">
             {% for tag in thread.get_tags %}
                 {% autoescape off %}
                     {{ tag.get_view }}{% if not forloop.last %},{% endif %}
                 {% endautoescape %}
             {% endfor %}
         </span>
     </div>
 {% endif %}
 </div>