Hopiu/django-imagekit
1
0
Fork 0
mirror of https://github.com/Hopiu/django-imagekit.git synced 2026-05-20 10:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a check to remove any wrappers from the file like object returned in storage.open()

Browse source
This commit is contained in:
Justin Driscoll 2009-02-04 14:23:52 -05:00
parent e1e2b52daa
commit 45f4c954f0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
imagekit/specs.py
View file

@ -49,17 +49,18 @@ class Accessor(object):
return return
# process the original image file # process the original image file
fp = self._obj._imgfield.storage.open(self._obj._imgfield.name) fp = self._obj._imgfield.storage.open(self._obj._imgfield.name)
fp = getattr(fp, 'file', fp)
fp.seek(0) fp.seek(0)
self._img = self.spec.process(Image.open(fp), self._obj) self._img = self.spec.process(Image.open(fp), self._obj)
# save the new image to the cache # save the new image to the cache
content = ContentFile(self._get_imgfile().read()) content = ContentFile(self._get_imgfile().read())
self._obj._imgfield.storage.save(self.name(), content) self._obj._imgfield.storage.save(self.name, content)
def _delete(self): def _delete(self):
self._obj._imgfield.storage.delete(self.name()) self._obj._imgfield.storage.delete(self.name)
def _exists(self): def _exists(self):
return self._obj._imgfield.storage.exists(self.name()) return self._obj._imgfield.storage.exists(self.name)
def _basename(self): def _basename(self):
filename, extension = \ filename, extension = \
@ -69,6 +70,7 @@ class Accessor(object):
'specname': self.spec.name(), 'specname': self.spec.name(),
'extension': extension.lstrip('.')} 'extension': extension.lstrip('.')}
@property
def name(self): def name(self):
return os.path.join(self._obj._ik.cache_dir, self._basename()) return os.path.join(self._obj._ik.cache_dir, self._basename())
@ -81,12 +83,12 @@ class Accessor(object):
current_count = getattr(self._obj, fieldname) current_count = getattr(self._obj, fieldname)
setattr(self._obj, fieldname, current_count + 1) setattr(self._obj, fieldname, current_count + 1)
self._obj.save(clear_cache=False) self._obj.save(clear_cache=False)
return self._obj._imgfield.storage.url(self.name()) return self._obj._imgfield.storage.url(self.name)
@property @property
def file(self): def file(self):
self._create() self._create()
return self._obj._imgfield.storage.open(self.name()) return self._obj._imgfield.storage.open(self.name)
@property @property
def image(self): def image(self):