Merge pull request #990 from karlcow/710/3

Fixes #710 - Add optimization for Image formats
webcompat · Apr 1, 2016 · 44e64bc · 44e64bc
2 parents 98e88a1 + 3240856
commit 44e64bc
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/webcompat/api/uploads.py b/webcompat/api/uploads.py
@@ -53,8 +53,8 @@ def to_image_object(self, imagedata):
                 # Chop off 'data:image/.+;base64,' before decoding
                 imagedata = re.sub('^data:image/.+;base64,', '', imagedata)
                 return Image.open(BytesIO(base64.b64decode(imagedata)))
-            raise IOError('Not a valid image format')
-        except IOError as e:
+            raise TypeError('TypeError: Not a valid image format')
+        except TypeError:
             # Not a valid format
             abort(415)
 
@@ -72,6 +72,7 @@ def get_url(self):
 
     def save(self):
         '''Check that the file is allowed, then save to filesystem.'''
+        save_parameters = {}
         if self.file_ext not in self.ALLOWED_FORMATS:
             raise TypeError('Image file format not allowed')
 
@@ -82,7 +83,15 @@ def save(self):
         dest_dir = os.path.dirname(file_dest)
         if not os.path.exists(dest_dir):
             os.makedirs(dest_dir)
-        self.image_object.save(file_dest)
+        # Optimize further the image compression for these formats
+        if self.image_object.format in ['JPEG', 'JPG', 'JPE', 'PNG']:
+            save_parameters['optimize'] = True
+        # If animated GIF, aka duration > 0, add save_all parameter
+        if (self.image_object.format == 'GIF' and
+           self.image_object.info['duration'] > 0):
+                save_parameters['save_all'] = True
+        # unpacking save_parameters
+        self.image_object.save(file_dest, **save_parameters)
 
 
 @uploads.route('/', methods=['POST'])