From 07a03a4a39a3cdfe589114899877a696d0d52e70 Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Fri, 11 Feb 2011 01:27:10 -0800 Subject: [PATCH 1/5] Fleshing out setup.py. Adding MANIFEST.in. --- MANIFEST.in | 2 ++ setup.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..27e27bd --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +include AUTHORS +include LICENSE diff --git a/setup.py b/setup.py index 184925d..0c0d585 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,9 @@ setup( author_email='justin@driscolldev.com', url='http://github.com/jdriscoll/django-imagekit/', packages=[ - 'imagekit' + 'imagekit', + 'imagekit.management', + 'imagekit.management.commands' ], classifiers=[ 'Development Status :: 3 - Alpha', From 34a2640cf590fd3c543ef2efe1356c87ecc960e0 Mon Sep 17 00:00:00 2001 From: Greg Newman Date: Sat, 12 Feb 2011 03:58:36 +0800 Subject: [PATCH 2/5] if the ImageField is null and not required, don't create --- imagekit/specs.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/imagekit/specs.py b/imagekit/specs.py index 4814c52..881cd50 100644 --- a/imagekit/specs.py +++ b/imagekit/specs.py @@ -52,7 +52,8 @@ class Accessor(object): def _create(self): if self._exists(): - return + if self._exists(): + return # process the original image file try: fp = self._obj._imgfield.storage.open(self._obj._imgfield.name) @@ -73,21 +74,22 @@ class Accessor(object): @property def name(self): - filepath, basename = os.path.split(self._obj._imgfield.name) - filename, extension = os.path.splitext(basename) - for processor in self.spec.processors: - if issubclass(processor, processors.Format): - extension = processor.extension - cache_filename = self._obj._ik.cache_filename_format % \ - {'filename': filename, - 'specname': self.spec.name(), - 'extension': extension.lstrip('.')} - if callable(self._obj._ik.cache_dir): - return self._obj._ik.cache_dir(self._obj, filepath, - cache_filename) - else: - return os.path.join(self._obj._ik.cache_dir, filepath, - cache_filename) + if self._obj._imgfield.name: + filepath, basename = os.path.split(self._obj._imgfield.name) + filename, extension = os.path.splitext(basename) + for processor in self.spec.processors: + if issubclass(processor, processors.Format): + extension = processor.extension + cache_filename = self._obj._ik.cache_filename_format % \ + {'filename': filename, + 'specname': self.spec.name(), + 'extension': extension.lstrip('.')} + if callable(self._obj._ik.cache_dir): + return self._obj._ik.cache_dir(self._obj, filepath, + cache_filename) + else: + return os.path.join(self._obj._ik.cache_dir, filepath, + cache_filename) @property def url(self): From 2b80ccf2e3bac9c7e18aa326f1a3dbe724954d01 Mon Sep 17 00:00:00 2001 From: Greg Newman Date: Sat, 12 Feb 2011 04:11:20 +0800 Subject: [PATCH 3/5] patch applied badly, fixing if --- imagekit/specs.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/imagekit/specs.py b/imagekit/specs.py index 881cd50..9d7fb87 100644 --- a/imagekit/specs.py +++ b/imagekit/specs.py @@ -51,20 +51,20 @@ class Accessor(object): return imgfile def _create(self): - if self._exists(): + if self._obj._imgfield: if self._exists(): return - # process the original image file - try: - fp = self._obj._imgfield.storage.open(self._obj._imgfield.name) - except IOError: - return - fp.seek(0) - fp = StringIO(fp.read()) - self._img, self._fmt = self.spec.process(Image.open(fp), self._obj) - # save the new image to the cache - content = ContentFile(self._get_imgfile().read()) - self._obj._storage.save(self.name, content) + # process the original image file + try: + fp = self._obj._imgfield.storage.open(self._obj._imgfield.name) + except IOError: + return + fp.seek(0) + fp = StringIO(fp.read()) + self._img, self._fmt = self.spec.process(Image.open(fp), self._obj) + # save the new image to the cache + content = ContentFile(self._get_imgfile().read()) + self._obj._storage.save(self.name, content) def _delete(self): self._obj._storage.delete(self.name) From 5d0808467e8ec884742860f5ac0da050e3549334 Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Fri, 11 Feb 2011 12:52:42 -0800 Subject: [PATCH 4/5] Bumping internal version to 0.3.4. --- imagekit/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/imagekit/__init__.py b/imagekit/__init__.py index 1d30445..aa78b1e 100644 --- a/imagekit/__init__.py +++ b/imagekit/__init__.py @@ -1,10 +1,11 @@ """ - Django ImageKit Author: Justin Driscoll -Version: 0.3.3 +Version: 0.3.4 """ -VERSION = "0.3.3" - \ No newline at end of file +__author__ = 'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett' +__version__ = (0, 3, 4) + + From 12bc6fa566ecbd721afc79975e19a9abed0dfa73 Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Fri, 11 Feb 2011 12:59:24 -0800 Subject: [PATCH 5/5] Adding distutils stuff to .gitignore. --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3808001..e3abc3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ *.pyc *.db *.orig -.DS_Store \ No newline at end of file +.DS_Store +dist +build +MANIFEST