haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2039 from haiwen/avatar_handle_error

Browse Source 
[avatar] Quick fix for avatar image truncated issue which will cause …
This commit is contained in:
xiez
2018-03-17 10:58:03 +08:00
committed by GitHub
parent 8802278bb5 eef3e0992d
commit a8f649e8e9
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
seahub/avatar/models.py
View File

@@ -3,6 +3,7 @@ from abc import abstractmethod
import datetime import datetime
import hashlib import hashlib
import os import os
import logging
from seahub.base.fields import LowerCaseCharField from seahub.base.fields import LowerCaseCharField
@@ -31,6 +32,9 @@ from seahub.avatar.settings import (AVATAR_STORAGE_DIR, AVATAR_RESIZE_METHOD,
AVATAR_THUMB_QUALITY, AUTO_GENERATE_AVATAR_SIZES, AVATAR_THUMB_QUALITY, AUTO_GENERATE_AVATAR_SIZES,
GROUP_AVATAR_STORAGE_DIR) GROUP_AVATAR_STORAGE_DIR)
# Get an instance of a logger
logger = logging.getLogger(__name__)
def avatar_file_path(instance=None, filename=None, size=None, ext=None): def avatar_file_path(instance=None, filename=None, size=None, ext=None):
if isinstance(instance, Avatar): if isinstance(instance, Avatar):
tmppath = [AVATAR_STORAGE_DIR] tmppath = [AVATAR_STORAGE_DIR]
@@ -89,8 +93,7 @@ class AvatarBase(object):
try: try:
orig = self.avatar.storage.open(self.avatar.name, 'rb').read() orig = self.avatar.storage.open(self.avatar.name, 'rb').read()
image = Image.open(StringIO(orig)) 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 quality = quality or AVATAR_THUMB_QUALITY
(w, h) = image.size (w, h) = image.size
if w != size or h != size: if w != size or h != size:
@@ -109,6 +112,9 @@ class AvatarBase(object):
else: else:
thumb_file = ContentFile(orig) thumb_file = ContentFile(orig)
thumb = self.avatar.storage.save(self.avatar_name(size), thumb_file) thumb = self.avatar.storage.save(self.avatar_name(size), thumb_file)
except Exception as e:
logger.error(e)
return # What should we do here? Render a "sorry, didn't work" img?
def avatar_url(self, size): def avatar_url(self, size):
return self.avatar.storage.url(self.avatar_name(size)) return self.avatar.storage.url(self.avatar_name(size))