Fix -- Add multi mimetype support for accept attr

Author: codingjoe

s3file/forms.py

@@ -28,10 +28,10 @@ def client(self):
     def build_attrs(self, *args, **kwargs):
         attrs = super().build_attrs(*args, **kwargs)
 
-        mime_type = attrs.get('accept', None)
+        accept = attrs.get('accept')
         response = self.client.generate_presigned_post(
             self.bucket_name, os.path.join(self.upload_folder, '${filename}'),
-            Conditions=self.get_conditions(mime_type),
+            Conditions=self.get_conditions(accept),
             ExpiresIn=self.expires,
         )
 
@@ -48,18 +48,21 @@ def build_attrs(self, *args, **kwargs):
             defaults['class'] = 's3file'
         return defaults
 
-    def get_conditions(self, mime_type):
+    def get_conditions(self, accept):
         conditions = [
             {"bucket": self.bucket_name},
             ["starts-with", "$key", self.upload_folder],
             {"success_action_status": "201"},
         ]
-        if mime_type:
-            top_type, sub_type = mime_type.split('/', 1)
-            if sub_type == '*':
-                conditions.append(["starts-with", "$Content-Type", "%s/" % top_type])
-            else:
-                conditions.append({"Content-Type": mime_type})
+        if accept:
+            accept = accept.replace(' ', '')  # remove whitespaces
+            mime_types = accept.split(',') if accept else []  # catch empty string
+            for mime_type in mime_types:
+                top_type, sub_type = mime_type.split('/', 1)
+                if sub_type == '*':
+                    conditions.append(["starts-with", "$Content-Type", "%s/" % top_type])
+                else:
+                    conditions.append({"Content-Type": mime_type})
         else:
             conditions.append(["starts-with", "$Content-Type", ""])
 

tests/test_forms.py

@@ -117,6 +117,20 @@ def test_accept(self):
         assert 'accept="image/jpeg"' in widget.render(name='file', value='test.jpg')
         assert {"Content-Type": 'image/jpeg'} in widget.get_conditions('image/jpeg')
 
+        widget = ClearableFileInput(attrs={'accept': 'application/pdf,image/*'})
+        assert 'accept="application/pdf,image/*"' in widget.render(name='file', value='test.jpg')
+        assert ["starts-with", "$Content-Type", "image/"] in widget.get_conditions(
+            'application/pdf,image/*')
+        assert {"Content-Type": 'application/pdf'} in widget.get_conditions(
+            'application/pdf,image/*')
+
+        widget = ClearableFileInput(attrs={'accept': 'application/pdf, image/*'})
+        assert 'accept="application/pdf, image/*"' in widget.render(name='file', value='test.jpg')
+        assert ["starts-with", "$Content-Type", "image/"] in widget.get_conditions(
+            'application/pdf, image/*')
+        assert {"Content-Type": 'application/pdf'} in widget.get_conditions(
+            'application/pdf, image/*')
+
     def test_no_js_error(self, driver, live_server):
         driver.get(live_server + self.url)