Merge branch 'frame-drawer-updates' into 'master'

Frame drawer updates See merge request gumgum-sports/computer-vision/multivitamin!53
gumgum · Jan 13, 2020 · 716f11d · 716f11d
2 parents 3d48127 + 4c197f2
commit 716f11d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/multivitamin/applications/images/frame_drawer.py b/multivitamin/applications/images/frame_drawer.py
@@ -225,7 +225,10 @@ def upload_video(self, video_file_path):
         client.upload_file(
             video_file_path,
             self.s3_bucket,
-            s3_key
+            s3_key,
+            ExtraArgs={
+                'ContentType': 'video/mp4'
+            }
         )
 
         s3_url = client.generate_presigned_url(
@@ -252,7 +255,10 @@ def upload_frames(self, image_directory):
             client.upload_file(
                 image_path,
                 self.s3_bucket,
-                s3_key
+                s3_key,
+                ExtraArgs={
+                    'ContentType': 'image/jpeg'
+                }
             )
 
             s3_url = client.generate_presigned_url(