fix #104, prepend default_storage.location to upload_path then strip it back out before passing to S3Boto3Storage

Author: aaron

s3file/forms.py

@@ -14,9 +14,13 @@ class S3FileInputMixin:
     """FileInput that uses JavaScript to directly upload to Amazon S3."""
 
     needs_multipart_form = False
-    upload_path = getattr(
-        settings, 'S3FILE_UPLOAD_PATH', pathlib.PurePosixPath('tmp', 's3file')
-    )
+    try: 
+        upload_path = pathlib.PurePosixPath(
+            default_storage.location, getattr(settings, 'S3FILE_UPLOAD_PATH')
+        )
+    except AttributeError:
+        upload_path = pathlib.PurePosixPath(default_storage.location, 'tmp', 's3file')
+
     expires = settings.SESSION_COOKIE_AGE
 
     @property

s3file/middleware.py

@@ -23,6 +23,7 @@ def __call__(self, request):
     def get_files_from_storage(paths):
         """Return S3 file where the name does not include the path."""
         for path in paths:
+            path = path.replace(default_storage.location + '/', '', 1)
             try:
                 f = default_storage.open(path)
                 f.name = os.path.basename(path)

tests/test_forms.py

@@ -34,7 +34,10 @@ def url(self):
     @pytest.fixture
     def freeze(self, monkeypatch):
         """Freeze datetime and UUID."""
-        monkeypatch.setattr('s3file.forms.S3FileInputMixin.upload_folder', 'tmp')
+        monkeypatch.setattr(
+            's3file.forms.S3FileInputMixin.upload_folder',
+            default_storage.location + '/' + 'tmp'
+        )
 
     def test_value_from_datadict(self, client, upload_file):
         with open(upload_file) as f:
@@ -95,7 +98,7 @@ def test_get_conditions(self, freeze):
         assert all(condition in conditions for condition in [
             {"bucket": 'test-bucket'},
             {"success_action_status": "201"},
-            ['starts-with', '$key', 'tmp'],
+            ['starts-with', '$key', default_storage.location + '/' + 'tmp'],
             ["starts-with", "$Content-Type", ""]
         ]), conditions
 
@@ -188,5 +191,7 @@ def test_media(self):
         assert ClearableFileInput().media._js == ['s3file/js/s3file.js']
 
     def test_upload_folder(self):
-        assert ClearableFileInput().upload_folder.startswith('tmp/s3file/')
-        assert len(ClearableFileInput().upload_folder) == 33
+        assert ClearableFileInput().upload_folder.startswith(
+            default_storage.location + '/' + 'tmp/s3file/'
+        )
+        assert len(ClearableFileInput().upload_folder) == 50