better upload

David-Crty · Oct 11, 2020 · 6748d8a · 6748d8a
1 parent 5e78110
commit 6748d8a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/UploadToS3.php b/src/UploadToS3.php
@@ -37,7 +37,8 @@ private function getClient(){
     }
 
     private function getContentDisposition(File $file){
-        return 'attachment; filename="'.$file->getName().'"';
+        $filename = mb_convert_encoding($file->getName(), "US-ASCII");
+        return 'attachment; filename="'.$filename.'"';
     }
 
     /**
@@ -48,12 +49,18 @@ private function getContentDisposition(File $file){
     public function uploadFile(File $file, $mainFolder){
         $source = fopen($file->getRealPath(), 'rb');
         $key = $file->generateS3Key($mainFolder);
+        $before = function (\Aws\Command $command) use ($file) {
+            $command['ContentType'] = $file->getMineType();
+            $command['ContentDisposition'] = $this->getContentDisposition($file);
+        };
 
         $uploader = new ObjectUploader(
             $this->getClient(),
             Env::get('AWS_BUCKET'),
             $key,
-            $source
+            $source,
+            'private',
+            ['before_upload' => $before]
         );
 
         do {
@@ -70,10 +77,7 @@ public function uploadFile(File $file, $mainFolder){
                     'key' => $file->generateS3Key($mainFolder),
                     'concurrency' => 2,
                     'part_size' => 100000000, // 100 Mo
-                    'before_initiate' => function (\Aws\Command $command) use ($file) {
-                        $command['ContentType'] = $file->getMineType();
-                        $command['ContentDisposition'] = $this->getContentDisposition($file);
-                    },
+                    'before_initiate' => $before,
                 ]);
             }
         } while (!isset($result));