Hopiu/django-imagekit
1
0
Fork 0
mirror of https://github.com/Hopiu/django-imagekit.git synced 2026-05-12 07:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back ProcessedImageField with spec registry

Browse source
This commit is contained in:
Matthew Tretter 2012-10-04 23:15:16 -04:00
parent 82d0e4be73
commit 56c66f4883
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
imagekit/models/fields/__init__.py
View file

@ -30,7 +30,8 @@ class ImageSpecField(SpecHost):
SpecHost.__init__(self, processors=p, format=format,
options=options, storage=storage, autoconvert=autoconvert,
image_cache_backend=image_cache_backend,
image_cache_strategy=image_cache_strategy, spec=spec, id=id)
image_cache_strategy=image_cache_strategy, spec=spec,
spec_id=id)
self.image_field = image_field
@ -71,7 +72,7 @@ class ImageSpecField(SpecHost):
pass
class ProcessedImageField(models.ImageField):
class ProcessedImageField(models.ImageField, SpecHost):
"""
ProcessedImageField is an ImageField that runs processors on the uploaded
image *before* saving it to storage. This is in contrast to specs, which
@ -83,7 +84,7 @@ class ProcessedImageField(models.ImageField):
def __init__(self, processors=None, format=None, options=None,
verbose_name=None, name=None, width_field=None, height_field=None,
autoconvert=True, **kwargs):
autoconvert=True, spec=None, spec_id=None, **kwargs):
"""
The ProcessedImageField constructor accepts all of the arguments that
the :class:`django.db.models.ImageField` constructor accepts, as well
@ -91,10 +92,11 @@ class ProcessedImageField(models.ImageField):
:class:`imagekit.models.ImageSpecField`.
"""
SpecHost.__init__(self, processors=processors, format=format,
options=options, autoconvert=autoconvert, spec=spec,
spec_id=spec_id)
models.ImageField.__init__(self, verbose_name, name, width_field,
height_field, **kwargs)
self.spec = ImageSpec(processors, format=format, options=options,
autoconvert=autoconvert)
def get_filename(self, filename):
filename = os.path.normpath(self.storage.get_valid_name(

6
imagekit/specs.py
View file

@ -174,7 +174,7 @@ class SpecHost(object):
"""
def __init__(self, processors=None, format=None, options=None,
storage=None, autoconvert=None, image_cache_backend=None,
image_cache_strategy=None, spec=None, id=None):
image_cache_strategy=None, spec=None, spec_id=None):
if spec:
if any([processors, format, options, storage, autoconvert,
@ -195,9 +195,9 @@ class SpecHost(object):
self._original_spec = spec
self.spec_id = None
if id:
if spec_id:
# If an id is given, register the spec immediately.
self.register_spec(id)
self.register_spec(spec_id)
def register_spec(self, id):
"""