From 0b5674f008cabdbf3ee5d0b77e1d327c362ed16b Mon Sep 17 00:00:00 2001 From: Mathieu Pillard Date: Fri, 22 Jan 2010 19:07:58 +0100 Subject: [PATCH] Simplify image handling. Breaks the new AVATAR_DONT_SAVE_DUPLICATES setting but I will revisit it later in a cleaner way --- avatar/models.py | 3 +-- avatar/views.py | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/avatar/models.py b/avatar/models.py index 05520d6..a944c52 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -20,8 +20,7 @@ from avatar import AVATAR_STORAGE_DIR, AVATAR_RESIZE_METHOD, \ AVATAR_MAX_AVATARS_PER_USER, AVATAR_THUMB_FORMAT -def avatar_file_path(instance=None, filename=None, user=None): - user = user or instance.user +def avatar_file_path(instance=None, filename=None): return os.path.join(AVATAR_STORAGE_DIR, user.username, filename) class Avatar(models.Model): diff --git a/avatar/views.py b/avatar/views.py index f068aad..89f84e2 100644 --- a/avatar/views.py +++ b/avatar/views.py @@ -72,19 +72,12 @@ def add(request, extra_context={}, next_override=None): request.FILES or None, user=request.user) if request.method == "POST" and 'avatar' in request.FILES: if upload_avatar_form.is_valid(): - path = avatar_file_path(user=request.user, - filename=request.FILES['avatar'].name) avatar = Avatar( user = request.user, primary = True, - avatar = path, ) - if AVATAR_DONT_SAVE_DUPLICATES and \ - avatar.avatar.storage.exists(path): - new_file = None - else: - new_file = avatar.avatar.storage.save(path, - request.FILES['avatar']) + image_file = request.FILES['avatar'] + avatar.avatar.save(image_file.name, image_file) avatar.save() updated = True request.user.message_set.create(