Merge pull request #476 from MasoniteFramework/improve-upload-driver

can now upload files directly to s3 using open()

masonite/drivers/BaseUploadDriver.py

@@ -3,6 +3,7 @@
 
 from masonite.exceptions import FileTypeException
 from masonite.drivers.BaseDriver import BaseDriver
+import _io
 
 
 class BaseUploadDriver(BaseDriver):
@@ -57,3 +58,10 @@ def get_location(self, location=None):
             return list(location.values())[0]
 
         return location
+
+    def get_name(self, fileitem):
+        if isinstance(fileitem, _io.TextIOWrapper):
+            # It is an open() file
+            return fileitem.name
+        else:
+            return fileitem.filename

masonite/drivers/UploadDiskDriver.py

@@ -1,6 +1,7 @@
 """ Upload Disk Driver """
 
 import os
+import _io
 
 from masonite.contracts.UploadContract import UploadContract
 from masonite.drivers.BaseUploadDriver import BaseUploadDriver
@@ -36,7 +37,7 @@ def store(self, fileitem, location=None):
             string -- Returns the file name just saved.
         """
 
-        filename = os.path.basename(fileitem.filename)
+        filename = self.get_name(fileitem)
 
         # Check if is a valid extension
         self.validate_extension(filename)
@@ -45,7 +46,10 @@ def store(self, fileitem, location=None):
         if not location.endswith('/'):
             location += '/'
 
-        open(location + filename, 'wb').write(fileitem.file.read())
+        if isinstance(fileitem, _io.TextIOWrapper):
+            open(location + filename, 'wb').write(bytes(fileitem.read(), 'utf-8'))
+        else:
+            open(location + filename, 'wb').write(fileitem.file.read())
 
         self.file_location = location + filename
 

masonite/drivers/UploadS3Driver.py

@@ -41,8 +41,10 @@ def store(self, fileitem, location=None):
         driver.store(fileitem, location)
         file_location = driver.file_location
 
+        filename = self.get_name(fileitem)
+
         # Check if is a valid extension
-        self.validate_extension(fileitem.filename)
+        self.validate_extension(filename)
 
         try:
             import boto3
@@ -60,10 +62,10 @@ def store(self, fileitem, location=None):
         s3.meta.client.upload_file(
             file_location,
             self.config.DRIVERS['s3']['bucket'],
-            fileitem.filename
+            filename
         )
 
-        return fileitem.filename
+        return filename
 
     def store_prepend(self, fileitem, prepend, location=None):
         """Store the file onto the Amazon S3 server but with a prepended file name.

masonite/info.py

@@ -2,4 +2,4 @@
 """
 
 
-VERSION = '2.0.34'
+VERSION = '2.0.35'

tests/test_upload_manager.py

@@ -135,6 +135,9 @@ def setup_method(self):
         def test_upload_file_for_s3(self):
             assert self.app.make('Upload').driver('s3').store(ImageMock()) == 'test.jpg'
 
+        def test_upload_open_file_for_s3(self):
+            assert self.app.make('Upload').driver('s3').store(open('.travis.yml'))
+
 
         def test_upload_manage_accept_files(self):
             """