Remove /by-md5/ prefix from image paths

Use forked django-images for now, until we can communicate with the
upstream about it. Fixes #4
This commit is contained in:
Krzysztof Klimonda
2013-03-19 14:41:14 +01:00
parent 20359b886d
commit e0e0ac1679
4 changed files with 24 additions and 7 deletions

16
pinry/core/utils.py Normal file
View File

@@ -0,0 +1,16 @@
import hashlib
import os
def upload_path(instance, filename, **kwargs):
hasher = hashlib.md5()
for chunk in instance.image.chunks():
hasher.update(chunk)
hash = hasher.hexdigest()
base, ext = os.path.splitext(filename)
return '%(first)s/%(second)s/%(hash)s/%(base)s%(ext)s' % {
'first': hash[0],
'second': hash[1],
'hash': hash,
'base': base,
'ext': ext,
}

View File

@@ -90,6 +90,7 @@ INSTALLED_APPS = (
'pinry.users', 'pinry.users',
) )
IMAGE_PATH = 'pinry.core.utils.upload_path'
IMAGE_SIZES = { IMAGE_SIZES = {
'thumbnail': {'size': [240, 0]}, 'thumbnail': {'size': [240, 0]},
'standard': {'size': [600, 0]}, 'standard': {'size': [600, 0]},

View File

@@ -6,5 +6,5 @@ django-braces
mock mock
factory-boy factory-boy
django_compressor django_compressor
http://github.com/mirumee/django-images/tarball/master#egg=django-images http://github.com/kklimonda/django-images/tarball/master#egg=django-images
http://github.com/hcarvalhoalves/django-taggit/tarball/master#egg=django-taggit http://github.com/hcarvalhoalves/django-taggit/tarball/master#egg=django-taggit

View File

@@ -8,18 +8,18 @@ def read(fname):
dependency_links = [ dependency_links = [
# Not released version, PIL dependency replaced by pillow # Not released version, PIL dependency replaced by pillow
'http://github.com/mirumee/django-images/tarball/master#egg=django-images-2013.1.99', 'http://github.com/kklimonda/django-images/tarball/master#egg=django-images-2013.1.99',
# Original project has been dead for years, this branch adds Django 1.4 support # Original project has been dead for years, this branch adds Django 1.4 support
'http://github.com/hcarvalhoalves/django-taggit/tarball/master#egg=django-taggit-0.9.3.99' 'http://github.com/hcarvalhoalves/django-taggit/tarball/master#egg=django-taggit-0.9.3.99'
] ]
install_requires = [ install_requires = [
'Django>=1.5', 'Django>=1.5',
'Pillow' 'Pillow',
'South' 'South',
'django-tastypie' 'django-tastypie',
'django-braces' 'django-braces',
'django_compressor' 'django_compressor',
'django-images>=2013.1.99', 'django-images>=2013.1.99',
'django-taggit>=0.9.3.99' 'django-taggit>=0.9.3.99'
] ]