Fixes #2 based on boto/boto3#548

Polymathian · Sep 30, 2020 · d3f283a · d3f283a
1 parent 7029b01
commit d3f283a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/sharpei.iml b/.idea/sharpei.iml
diff --git a/sharpei/handler.py b/sharpei/handler.py
@@ -2,6 +2,7 @@
 from os import path
 from typing import Union
 import logging
+import mimetypes
 
 from watchdog import events
 import boto3
@@ -42,11 +43,16 @@ def _relative_s3_filename(self, filename: str) -> str:
     def s3_upload(self, file_path: str):
         upload_key = self.base_key + self._relative_s3_filename(file_path)
         logger.info(f"Upload {file_path} to s3://{self.bucket}/{upload_key}")
+        extra_args = self.s3_args.copy()
+        mimetype, _ = mimetypes.guess_type(file_path)
+        if mimetype:
+            extra_args["ContentType"] = mimetype
+
         s3_client.upload_file(
             Filename=file_path,
             Bucket=self.bucket,
             Key=upload_key,
-            ExtraArgs=self.s3_args,
+            ExtraArgs=extra_args,
         )
 
     def on_any_event(self, event: events.FileSystemEvent):