fix file name in upload

bradleyg · Feb 11, 2024 · d392776 · d392776
1 parent ba1f65f
commit d392776
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/s3direct/fields.py b/s3direct/fields.py
@@ -3,6 +3,7 @@
 import botocore
 import json
 from urllib.parse import unquote
+from email.message import EmailMessage
 
 from django import forms
 
@@ -86,12 +87,10 @@ def validate_url(value, dest):
 
             content_disposition = head_object["ContentDisposition"]
             header_value, header_params = cgi.parse_header(content_disposition)
-            filename = ""
-            for param_name in ["filename*", "filename"]:
-                if param_name in header_params:
-                    filename = header_params[param_name].strip("UTF-8''")
-                    filename = unquote(filename)
-                    break
+
+            msg = EmailMessage()
+            msg["Content-Disposition"] = content_disposition
+            filename = msg.get_filename()
 
             mimetype = head_object["ContentType"]
             return {