diff --git a/group/forms.py b/group/forms.py index 165b880799..48a1578f37 100644 --- a/group/forms.py +++ b/group/forms.py @@ -1,8 +1,30 @@ +import os + from django import forms +from django.utils.translation import ugettext as _ +from django.template.defaultfilters import filesizeformat + +from group.settings import ( AVATAR_MAX_SIZE, AVATAR_ALLOWED_FILE_EXTS) class MessageForm(forms.Form): message = forms.CharField(max_length=500) class MessageReplyForm(forms.Form): message = forms.CharField(max_length=150) - + +class AvatarForm(forms.Form): + avatar = forms.ImageField() + + def clean_avatar(self): + data = self.cleaned_data['avatar'] + if AVATAR_ALLOWED_FILE_EXTS: + (root, ext) = os.path.splitext(data.name.lower()) + if ext not in AVATAR_ALLOWED_FILE_EXTS: + raise forms.ValidationError( + _(u"%(ext)s is an invalid file extension. Authorized extensions are : %(valid_exts_list)s") % + { 'ext' : ext, 'valid_exts_list' : ", ".join(AVATAR_ALLOWED_FILE_EXTS) }) + if data.size > AVATAR_MAX_SIZE: + raise forms.ValidationError( + _(u"Your file is too big (%(size)s), the maximum allowed size is %(max_valid_size)s") % + { 'size' : filesizeformat(data.size), 'max_valid_size' : filesizeformat(AVATAR_MAX_SIZE)}) + diff --git a/group/models.py b/group/models.py index 80d2402fed..77d4d09148 100644 --- a/group/models.py +++ b/group/models.py @@ -1,5 +1,26 @@ import datetime +import os +from django.core.files.base import ContentFile +from django.utils.translation import ugettext as _ +from django.utils.hashcompat import md5_constructor + from django.db import models +from group.settings import (AVATAR_STORAGE_DIR, AVATAR_RESIZE_METHOD, + AVATAR_MAX_AVATARS_PER_USER, AVATAR_THUMB_FORMAT, + AVATAR_HASH_USERDIRNAMES, AVATAR_HASH_FILENAMES, + AVATAR_THUMB_QUALITY, AUTO_GENERATE_AVATAR_SIZES) + +try: + from cStringIO import StringIO + dir(StringIO) # Placate PyFlakes +except ImportError: + from StringIO import StringIO + +try: + from PIL import Image + dir(Image) # Placate PyFlakes +except ImportError: + import Image class GroupMessage(models.Model): group_id = models.IntegerField() @@ -12,3 +33,86 @@ class MessageReply(models.Model): from_email = models.EmailField() message = models.CharField(max_length=150) timestamp = models.DateTimeField(default=datetime.datetime.now) + +def avatar_file_path(instance=None, filename=None, size=None, ext=None): + tmppath = [AVATAR_STORAGE_DIR] + if AVATAR_HASH_USERDIRNAMES: + tmp = md5_constructor(instance.user.username).hexdigest() + tmppath.extend([tmp[0], tmp[1], instance.group_id]) + else: + tmppath.append(instance.group_id) + if not filename: + # Filename already stored in database + filename = instance.avatar.name + if ext and AVATAR_HASH_FILENAMES: + # An extension was provided, probably because the thumbnail + # is in a different format than the file. Use it. Because it's + # only enabled if AVATAR_HASH_FILENAMES is true, we can trust + # it won't conflict with another filename + (root, oldext) = os.path.splitext(filename) + filename = root + "." + ext + else: + # File doesn't exist yet + if AVATAR_HASH_FILENAMES: + (root, ext) = os.path.splitext(filename) + filename = md5_constructor(smart_str(filename)).hexdigest() + filename = filename + ext + if size: + tmppath.extend(['resized', str(size)]) + tmppath.append(os.path.basename(filename)) + return os.path.join(*tmppath) + +def find_extension(format): + format = format.lower() + + if format == 'jpeg': + format = 'jpg' + + return format + +class Avatar(models.Model): + group_id = models.CharField(max_length=255) + avatar = models.ImageField(max_length=1024, upload_to=avatar_file_path, blank=True) + date_uploaded = models.DateTimeField(default=datetime.datetime.now) + + def __unicode__(self): + return _(u'Avatar for %s') % self.group_id + + def thumbnail_exists(self, size): + return self.avatar.storage.exists(self.avatar_name(size)) + + def create_thumbnail(self, size, quality=None): + try: + orig = self.avatar.storage.open(self.avatar.name, 'rb').read() + image = Image.open(StringIO(orig)) + except IOError: + return # What should we do here? Render a "sorry, didn't work" img? + quality = quality or AVATAR_THUMB_QUALITY + (w, h) = image.size + if w != size or h != size: + if w > h: + diff = (w - h) / 2 + image = image.crop((diff, 0, w - diff, h)) + else: + diff = (h - w) / 2 + image = image.crop((0, diff, w, h - diff)) + if image.mode != "RGB": + image = image.convert("RGB") + image = image.resize((size, size), AVATAR_RESIZE_METHOD) + thumb = StringIO() + image.save(thumb, AVATAR_THUMB_FORMAT, quality=quality) + thumb_file = ContentFile(thumb.getvalue()) + else: + thumb_file = ContentFile(orig) + thumb = self.avatar.storage.save(self.avatar_name(size), thumb_file) + + def avatar_url(self, size): + return self.avatar.storage.url(self.avatar_name(size)) + + def avatar_name(self, size): + ext = find_extension(AVATAR_THUMB_FORMAT) + return avatar_file_path( + instance=self, + size=size, + ext=ext + ) diff --git a/group/settings.py b/group/settings.py new file mode 100644 index 0000000000..829f02f9c3 --- /dev/null +++ b/group/settings.py @@ -0,0 +1,23 @@ +from django.conf import settings + +try: + from PIL import Image + dir(Image) # Placate PyFlakes +except ImportError: + import Image + +AVATAR_DEFAULT_SIZE = 48 +AUTO_GENERATE_AVATAR_SIZES = (80, 48) +AVATAR_RESIZE_METHOD = getattr(settings, 'AVATAR_RESIZE_METHOD', Image.ANTIALIAS) +AVATAR_STORAGE_DIR = 'avatars/groups' +AVATAR_GRAVATAR_BACKUP = getattr(settings, 'AVATAR_GRAVATAR_BACKUP', True) +AVATAR_GRAVATAR_DEFAULT = getattr(settings, 'AVATAR_GRAVATAR_DEFAULT', None) +AVATAR_DEFAULT_URL = 'avatars/groups/default.png' +AVATAR_MAX_AVATARS_PER_USER = getattr(settings, 'AVATAR_MAX_AVATARS_PER_USER', 42) +AVATAR_MAX_SIZE = getattr(settings, 'AVATAR_MAX_SIZE', 1024 * 1024) +AVATAR_THUMB_FORMAT = getattr(settings, 'AVATAR_THUMB_FORMAT', "JPEG") +AVATAR_THUMB_QUALITY = getattr(settings, 'AVATAR_THUMB_QUALITY', 85) +AVATAR_HASH_FILENAMES = getattr(settings, 'AVATAR_HASH_FILENAMES', False) +AVATAR_HASH_USERDIRNAMES = getattr(settings, 'AVATAR_HASH_USERDIRNAMES', False) +AVATAR_ALLOWED_FILE_EXTS = getattr(settings, 'AVATAR_ALLOWED_FILE_EXTS', None) +AVATAR_CACHE_TIMEOUT = getattr(settings, 'AVATAR_CACHE_TIMEOUT', 60*60) diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html index b1c39c3e26..e0dc7adf17 100644 --- a/group/templates/group/group_manage.html +++ b/group/templates/group/group_manage.html @@ -10,8 +10,9 @@

操作

diff --git a/group/templates/group/groups.html b/group/templates/group/groups.html index 3f8f91acf2..8f1775b744 100644 --- a/group/templates/group/groups.html +++ b/group/templates/group/groups.html @@ -1,5 +1,5 @@ {% extends "myhome_base.html" %} -{% load seahub_tags %} +{% load seahub_tags group_tags %} {% block nav_group_class %}class="cur"{% endblock %} {% block left_panel %} @@ -18,7 +18,7 @@
  • - 小组图标 + {{ group.props.group_name }}的图标
    @@ -44,7 +44,7 @@ {% block extra_script %}