diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-05 23:28:27 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-05 23:28:27 +0200 | 
| commit | 15b96ce779fef77bfa38d39c67b5c55658218ad6 (patch) | |
| tree | 4bfbe86ca07870bf4062a79dfee49d6f82189872 | |
| parent | ef0f4113e70fee55e399f76229e0712caeed849c (diff) | |
| download | Ishtar-15b96ce779fef77bfa38d39c67b5c55658218ad6.tar.bz2 Ishtar-15b96ce779fef77bfa38d39c67b5c55658218ad6.zip | |
Silent error when the associated image is not on the hard drive
| -rw-r--r-- | ishtar_common/models.py | 40 | 
1 files changed, 21 insertions, 19 deletions
| diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 833dfbec9..d8948d3e3 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -552,25 +552,27 @@ class ImageModel(models.Model):              filename = os.path.splitext(os.path.split(self.image.name)[-1])[0]              old_path = self.image.path              filename = "%s.jpg" % filename -            image = Image.open(self.image.file) - -            # convert to RGB -            if image.mode not in ('L', 'RGB'): -                image = image.convert('RGB') - -            # resize if necessary -            self.image.save(filename, -                            self.create_thumb(image, self.IMAGE_MAX_SIZE), -                            save=False) - -            if old_path != self.image.path: -                os.remove(old_path) - -            # save the thumbnail -            self.thumbnail.save( -                '_%s' % filename, -                self.create_thumb(image, self.THUMB_MAX_SIZE), -                save=False) +            try: +                image = Image.open(self.image.file) +                # convert to RGB +                if image.mode not in ('L', 'RGB'): +                    image = image.convert('RGB') + +                # resize if necessary +                self.image.save(filename, +                                self.create_thumb(image, self.IMAGE_MAX_SIZE), +                                save=False) + +                if old_path != self.image.path: +                    os.remove(old_path) + +                # save the thumbnail +                self.thumbnail.save( +                    '_%s' % filename, +                    self.create_thumb(image, self.THUMB_MAX_SIZE), +                    save=False) +            except IOError: +                pass          super(ImageModel, self).save(*args, **kwargs) | 
