From ec24519dd078c988c9102a9f5d34b20b89c971b4 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Nov 2012 15:40:33 -0800 Subject: [PATCH 1/5] Change easy thumbnail backend filename, and add more options --- .../backends/{easy_thumbnails.py => easythumbnails.py} | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) rename ajaxuploader/backends/{easy_thumbnails.py => easythumbnails.py} (60%) diff --git a/ajaxuploader/backends/easy_thumbnails.py b/ajaxuploader/backends/easythumbnails.py similarity index 60% rename from ajaxuploader/backends/easy_thumbnails.py rename to ajaxuploader/backends/easythumbnails.py index 2748cb9..f67da53 100644 --- a/ajaxuploader/backends/easy_thumbnails.py +++ b/ajaxuploader/backends/easythumbnails.py @@ -9,13 +9,17 @@ class EasyThumbnailUploadBackend(LocalUploadBackend): DIMENSIONS = (100,000) CROP = True KEEP_ORIGINAL = False + QUALITY = 100 + DETAIL = True + SHARPEN = True def upload_complete(self, request, filename): - options = {'size': self.DIMENSIONS, 'crop': self.CROP} + options = {'size': self.DIMENSIONS, 'crop': self.CROP, 'quality': self.QUALITY, + 'detail': self.DETAIL, 'sharpen': self.SHARPEN} thumb = get_thumbnailer(self._path).get_thumbnail(options) if not self.KEEP_ORIGINAL: os.unlink(self._path) - return {"path": settings.MEDIA_URL + os.path.split(thumb.path)[1]} \ No newline at end of file + return {"path": settings.MEDIA_URL + self.UPLOAD_DIR + '/' + os.path.split(thumb.path)[1]} \ No newline at end of file From 1dd973125f7077fe1927be5867d36c308b093fa8 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Nov 2012 22:11:40 -0800 Subject: [PATCH 2/5] Add upscale in easy thumbnails backend --- ajaxuploader/backends/easythumbnails.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ajaxuploader/backends/easythumbnails.py b/ajaxuploader/backends/easythumbnails.py index f67da53..9dc778f 100644 --- a/ajaxuploader/backends/easythumbnails.py +++ b/ajaxuploader/backends/easythumbnails.py @@ -12,11 +12,12 @@ class EasyThumbnailUploadBackend(LocalUploadBackend): QUALITY = 100 DETAIL = True SHARPEN = True + UPSCALE = True def upload_complete(self, request, filename): options = {'size': self.DIMENSIONS, 'crop': self.CROP, 'quality': self.QUALITY, - 'detail': self.DETAIL, 'sharpen': self.SHARPEN} + 'detail': self.DETAIL, 'sharpen': self.SHARPEN, 'upscale':UPSCALE,} thumb = get_thumbnailer(self._path).get_thumbnail(options) if not self.KEEP_ORIGINAL: From 835b88c018c47d60a041191e91b6abddaef3f4aa Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Nov 2012 22:31:45 -0800 Subject: [PATCH 3/5] improve upload dir --- ajaxuploader/backends/local.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ajaxuploader/backends/local.py b/ajaxuploader/backends/local.py index 6711a83..e80c211 100644 --- a/ajaxuploader/backends/local.py +++ b/ajaxuploader/backends/local.py @@ -1,6 +1,6 @@ from io import FileIO, BufferedWriter import os - +import uuid from django.conf import settings from ajaxuploader.backends.base import AbstractUploadBackend @@ -10,6 +10,7 @@ class LocalUploadBackend(AbstractUploadBackend): UPLOAD_DIR = "uploads" def setup(self, filename, *args, **kwargs): + self.UPLOAD_DIR = self.UPLOAD_DIR + '/'+ str(uuid.uuid4()) self._path = os.path.join( settings.MEDIA_ROOT, self.UPLOAD_DIR, filename) try: From bf470960a350ddc63b6bd2c90b7ca0a90e3da53d Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 16 Nov 2012 22:46:36 -0800 Subject: [PATCH 4/5] Fix upload dir --- ajaxuploader/backends/easythumbnails.py | 3 +-- ajaxuploader/backends/local.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ajaxuploader/backends/easythumbnails.py b/ajaxuploader/backends/easythumbnails.py index 9dc778f..7f6bf5a 100644 --- a/ajaxuploader/backends/easythumbnails.py +++ b/ajaxuploader/backends/easythumbnails.py @@ -13,11 +13,10 @@ class EasyThumbnailUploadBackend(LocalUploadBackend): DETAIL = True SHARPEN = True UPSCALE = True - def upload_complete(self, request, filename): options = {'size': self.DIMENSIONS, 'crop': self.CROP, 'quality': self.QUALITY, - 'detail': self.DETAIL, 'sharpen': self.SHARPEN, 'upscale':UPSCALE,} + 'detail': self.DETAIL, 'sharpen': self.SHARPEN,'upscale': self.UPSCALE,} thumb = get_thumbnailer(self._path).get_thumbnail(options) if not self.KEEP_ORIGINAL: diff --git a/ajaxuploader/backends/local.py b/ajaxuploader/backends/local.py index e80c211..c51c216 100644 --- a/ajaxuploader/backends/local.py +++ b/ajaxuploader/backends/local.py @@ -10,7 +10,7 @@ class LocalUploadBackend(AbstractUploadBackend): UPLOAD_DIR = "uploads" def setup(self, filename, *args, **kwargs): - self.UPLOAD_DIR = self.UPLOAD_DIR + '/'+ str(uuid.uuid4()) + self.UPLOAD_DIR = self.UPLOAD_DIR + "/%s" % (uuid.uuid4()) self._path = os.path.join( settings.MEDIA_ROOT, self.UPLOAD_DIR, filename) try: From f2582d05b542b7076d100fce3b65aa3a4fdfb578 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 23 Nov 2012 00:17:19 -0800 Subject: [PATCH 5/5] change --- ajaxuploader/backends/easythumbnails.py | 2 +- ajaxuploader/static/ajaxuploader/js/fileuploader.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ajaxuploader/backends/easythumbnails.py b/ajaxuploader/backends/easythumbnails.py index 7f6bf5a..6b94c30 100644 --- a/ajaxuploader/backends/easythumbnails.py +++ b/ajaxuploader/backends/easythumbnails.py @@ -22,4 +22,4 @@ def upload_complete(self, request, filename): if not self.KEEP_ORIGINAL: os.unlink(self._path) - return {"path": settings.MEDIA_URL + self.UPLOAD_DIR + '/' + os.path.split(thumb.path)[1]} \ No newline at end of file + return {"path": self.UPLOAD_DIR + '/' + os.path.split(thumb.path)[1]} \ No newline at end of file diff --git a/ajaxuploader/static/ajaxuploader/js/fileuploader.js b/ajaxuploader/static/ajaxuploader/js/fileuploader.js index 520c1d7..a9e9ea0 100644 --- a/ajaxuploader/static/ajaxuploader/js/fileuploader.js +++ b/ajaxuploader/static/ajaxuploader/js/fileuploader.js @@ -520,8 +520,8 @@ qq.FileUploader = function(o){ listElement: null, template: '
' + - '
Drop files here to upload
' + - '
Upload a file
' + + '
Drop images here to upload
' + + '
Upload an Image
' + '
    ' + '
    ',